| 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 d96785e2121de96e6162c280da8ee3f6ef6dbdbf..d97835dc034ca837f6a435cec324d003c8d1d1e9 100644
|
| --- a/media/base/android/media_decoder_job.cc
|
| +++ b/media/base/android/media_decoder_job.cc
|
| @@ -543,9 +543,10 @@ void MediaDecoderJob::OnDecodeCompleted(
|
| }
|
|
|
| if (status == MEDIA_CODEC_OUTPUT_FORMAT_CHANGED) {
|
| - if (UpdateOutputFormat())
|
| - config_changed_cb_.Run();
|
| - status = MEDIA_CODEC_OK;
|
| + if (!UpdateOutputFormat(config_changed_cb_))
|
| + status = MEDIA_CODEC_ERROR;
|
| + else
|
| + status = MEDIA_CODEC_OK;
|
| }
|
|
|
| if (release_resources_pending_) {
|
| @@ -649,10 +650,6 @@ bool MediaDecoderJob::IsCodecReconfigureNeeded(
|
| return true;
|
| }
|
|
|
| -bool MediaDecoderJob::UpdateOutputFormat() {
|
| - return false;
|
| -}
|
| -
|
| void MediaDecoderJob::ReleaseMediaCodecBridge() {
|
| if (!media_codec_bridge_)
|
| return;
|
|
|