Merge "Update the documentiation for MediaMuxer::writeSampleData()" into jb-mr2-dev

2013-04-08 17:22:28 +00:00
parent 26c1343984 f7d3aae328
commit 50b9eb1c73
1 changed files with 4 additions and 2 deletions
--- a/media/java/android/media/MediaMuxer.java
+++ b/media/java/android/media/MediaMuxer.java
@ -257,8 +257,10 @@ final public class MediaMuxer {
    }

    /**
-     * Writes an encoded sample into the muxer. The application needs to make
-     * sure that the samples are written into the right tracks.
+     * Writes an encoded sample into the muxer.
+     * <p>The application needs to make sure that the samples are written into
+     * the right tracks. Also, it needs to make sure the samples for each track
+     * are written in chronological order.</p>
     * @param byteBuf The encoded sample.
     * @param trackIndex The track index for this sample.
     * @param bufferInfo The buffer information related to this sample.