Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c287dbe authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update MediaMuxer javadoc to reflect that B-frame muxing is supported... 

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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3300935



Change-Id: I6e82d97dc6abb554272d665406e9d252914f64e2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c68733ec 9e36084a

media/java/android/media/MediaMuxer.java

+3 −3
Original line number Diff line number Diff line
@@ -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:

 *
@@ -198,7 +198,7 @@ import java.util.Map; 
    <td>&#9675;</td>

    <td>&#9675;</td>

    <td>&#9675;</td>

    <td>&#8277;</td>

    <td>&#9675;</td>

    <td>&#8277;</td>

    <td>&#8277;</td>

   </tr>