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

Commit b6678262 authored by Hangyu Kuang's avatar Hangyu Kuang Committed by android-build-merger
Browse files

Merge "Update Android mediamuxer documentation as it supports webm already." into nyc-dev 

am: 6dfd022b

* commit '6dfd022b':
  Update Android mediamuxer documentation as it supports webm already.
parents 938458c1 6dfd022b

media/java/android/media/MediaMuxer.java

+2 −2
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ import java.nio.ByteBuffer; 
import java.util.Map;



/**

 * MediaMuxer facilitates muxing elementary streams. Currently only supports an

 * mp4 file as the output and at most one audio and/or one video elementary

 * 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.

 * <p>

 * It is generally used like this: