commit 7c33a5dccee1849f7d2a7a6dbea0da2d4eeb27c2
author Hangyu Kuang <hkuang@google.com> Thu Mar 31 21:32:42 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 31 21:32:43 2016 +0000
tree 39ba6a99f090490b89e2ab6f5e3d487c40dd2c70
parent 99a3ee13f4ba3e400709737a49c94d56b7f61e9f
parent d853da5425f616b96aa8f8106a802afd5bbae47a

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

media/java/android/media/MediaMuxer.java

diff --git a/media/java/android/media/MediaMuxer.java b/media/java/android/media/MediaMuxer.java
index ebe509c..7117fbd 100644
--- a/media/java/android/media/MediaMuxer.java
+++ b/media/java/android/media/MediaMuxer.java
@@ -34,7 +34,7 @@
 /**
  * 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:
  *