summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sheena Chhabra <sheenachhabra@google.com> 2024-10-09 13:41:00 +0000
committer Sheena Chhabra <sheenachhabra@google.com> 2024-10-09 13:41:00 +0000
commit97fb1a80a57edb19cd3eeb6ac2feecc8afbde4d0 (patch)
treeb22442072cc7e12a7e4e0d23ba310e5de97eff3b
parentfcfc6c13f523807a9d7e7f5a18683ee7f8b9d233 (diff)
Update MediaMuxer javadoc to reflect that B-frame muxing is supported since Android Nougat MR1.
Change-Id: I56df4258dd83d0d23013bb282e6e24ed93776dd7
-rw-r--r--media/java/android/media/MediaMuxer.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/media/java/android/media/MediaMuxer.java b/media/java/android/media/MediaMuxer.java
index ad4feecf7d3c..3214cded4391 100644
--- 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 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 @@ import java.util.Map;
<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>&#9675;</td>
- <td>&#8277;</td>
<td>&#8277;</td>
<td>&#8277;</td>
</tr>