Merge "Update mediamuxer documentation that it does not support muxing B-frames." into nyc-dev

2016-03-31 21:32:42 +00:00
parent 99a3ee13f4 d853da5425
commit 7c33a5dcce
1 changed files with 1 additions and 1 deletions
--- a/media/java/android/media/MediaMuxer.java
+++ b/media/java/android/media/MediaMuxer.java
@@ -34,7 +34,7 @@ import java.util.Map;
 /**
 * MediaMuxer facilitates muxing elementary streams. Currently supports mp4 or
 * webm file as the output and at most one audio and/or one video elementary
- * stream.
+ * stream. MediaMuxer does not support muxing B-frames.
 * <p>
 * It is generally used like this:
 *