diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-08 13:08:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-08 13:08:21 -0700 |
| commit | 6736cca08df84328913962f9a14fafa13a25d390 (patch) | |
| tree | 4cce7db39c794994b87a9740aa799ef291021faa /media/java | |
| parent | be3d2cf10b79ebee5455854823ff6947dc919d8e (diff) | |
| parent | 52410be8ec092bfa7e84f2d8facdc161d6107ac3 (diff) | |
| download | frameworks_base-6736cca08df84328913962f9a14fafa13a25d390.zip frameworks_base-6736cca08df84328913962f9a14fafa13a25d390.tar.gz frameworks_base-6736cca08df84328913962f9a14fafa13a25d390.tar.bz2 | |
am 52410be8: Merge "mediacodec: Don\'t suggest calling getOutputFormat() immediately"
* commit '52410be8ec092bfa7e84f2d8facdc161d6107ac3':
mediacodec: Don't suggest calling getOutputFormat() immediately
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/MediaCodec.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java index 560c549..99db066 100644 --- a/media/java/android/media/MediaCodec.java +++ b/media/java/android/media/MediaCodec.java @@ -33,7 +33,6 @@ import java.util.Map; * codec.start(); * ByteBuffer[] inputBuffers = codec.getInputBuffers(); * ByteBuffer[] outputBuffers = codec.getOutputBuffers(); - * MediaFormat format = codec.getOutputFormat(); * for (;;) { * int inputBufferIndex = codec.dequeueInputBuffer(timeoutUs); * if (inputBufferIndex >= 0) { @@ -51,7 +50,7 @@ import java.util.Map; * outputBuffers = codec.getOutputBuffers(); * } else if (outputBufferIndex == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) { * // Subsequent data will conform to new format. - * format = codec.getOutputFormat(); + * MediaFormat format = codec.getOutputFormat(); * ... * } * } |