Skip to content

Commit 6736cca

Browse files
Jean-Baptiste QueruAndroid Git Automerger
authored andcommitted
am 52410be: Merge "mediacodec: Don\'t suggest calling getOutputFormat() immediately"
* commit '52410be8ec092bfa7e84f2d8facdc161d6107ac3': mediacodec: Don't suggest calling getOutputFormat() immediately
2 parents be3d2cf + 52410be commit 6736cca

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

media/java/android/media/MediaCodec.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
* codec.start();
3434
* ByteBuffer[] inputBuffers = codec.getInputBuffers();
3535
* ByteBuffer[] outputBuffers = codec.getOutputBuffers();
36-
* MediaFormat format = codec.getOutputFormat();
3736
* for (;;) {
3837
* int inputBufferIndex = codec.dequeueInputBuffer(timeoutUs);
3938
* if (inputBufferIndex >= 0) {
@@ -51,7 +50,7 @@
5150
* outputBuffers = codec.getOutputBuffers();
5251
* } else if (outputBufferIndex == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
5352
* // Subsequent data will conform to new format.
54-
* format = codec.getOutputFormat();
53+
* MediaFormat format = codec.getOutputFormat();
5554
* ...
5655
* }
5756
* }

0 commit comments

Comments
 (0)