Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 6dfd022bb8

* commit '6dfd022bb823628116ee1b635b7f08f1d63127f9':
  Update Android mediamuxer documentation as it supports webm already.
This commit is contained in:
Hangyu Kuang
2016-02-12 23:38:20 +00:00
committed by android-build-merger
parent 938458c16f 6dfd022bb8
commit b6678262dd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/media/MediaMuxer.java
View File

@@ -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: