| Index: media/base/android/media_decoder_job.cc
|
| diff --git a/media/base/android/media_decoder_job.cc b/media/base/android/media_decoder_job.cc
|
| index 61df5c07e1987f48a13ca3f0a70a1a31824946b8..2be8ef1821298eca43aa1a72a41d9fe2c45ae0e0 100644
|
| --- a/media/base/android/media_decoder_job.cc
|
| +++ b/media/base/android/media_decoder_job.cc
|
| @@ -430,10 +430,7 @@ void MediaDecoderJob::DecodeInternal(
|
| &presentation_timestamp,
|
| &output_eos_encountered_,
|
| NULL);
|
| - if (status == MEDIA_CODEC_OUTPUT_BUFFERS_CHANGED &&
|
| - !media_codec_bridge_->GetOutputBuffers()) {
|
| - status = MEDIA_CODEC_ERROR;
|
| - } else if (status == MEDIA_CODEC_OUTPUT_FORMAT_CHANGED) {
|
| + if (status == MEDIA_CODEC_OUTPUT_FORMAT_CHANGED) {
|
| // TODO(qinmin): instead of waiting for the next output buffer to be
|
| // dequeued, post a task on the UI thread to signal the format change.
|
| has_format_change = true;
|
|
|