commit 9e36084a54e77ef7aa7ef3cef088623e48e98cc5
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Oct 09 17:05:27 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 09 17:05:27 2024 +0000
tree 29e450484077bde453f8424e34ce574203fbe1aa
parent a297aabf4be5a4d1af28d6cf365742124e5037a9
parent 97fb1a80a57edb19cd3eeb6ac2feecc8afbde4d0

Merge "Update MediaMuxer javadoc to reflect that B-frame muxing is supported since Android Nougat MR1." into main

media/java/android/media/MediaMuxer.java

diff --git a/media/java/android/media/MediaMuxer.java b/media/java/android/media/MediaMuxer.java
index 80b606c..5e55f64 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 MediaMuxer supports MP4, Webm
- * and 3GP file as the output. It also supports muxing B-frames in MP4 since Android Nougat.
+ * and 3GP file as the output. It also supports muxing B-frames in MP4 since Android Nougat MR1.
  * <p>
  * It is generally used like this:
  *
@@ -191,14 +191,14 @@
     <td>&#9675;</td>
     <td>&#9679;</td>
    </tr>
-    <td align="center">Muxing B-Frames(bi-directional predicted frames)</td>
+    <td align="center">Muxing B-Frames (bi-directional predicted frames)</td>
     <td>&#9675;</td>
     <td>&#9675;</td>
     <td>&#9675;</td>
     <td>&#9675;</td>
     <td>&#9675;</td>
     <td>&#9675;</td>
-    <td>&#8277;</td>
+    <td>&#9675;</td>
     <td>&#8277;</td>
     <td>&#8277;</td>
    </tr>