diff options
| author | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-25 21:11:23 +0000 |
|---|---|---|
| committer | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-25 21:11:23 +0000 |
| commit | b0ff4e7c000ef7974e2b316388b4416d2ee59007 (patch) | |
| tree | 9fa41479f7b8ad3fab74dbd67a2714933539dcfa | |
| parent | 4b43a78c2b434fc75ec3a860a180a5d50e12be3e (diff) | |
| download | chromium_src-b0ff4e7c000ef7974e2b316388b4416d2ee59007.zip chromium_src-b0ff4e7c000ef7974e2b316388b4416d2ee59007.tar.gz chromium_src-b0ff4e7c000ef7974e2b316388b4416d2ee59007.tar.bz2 | |
singal error to host when demuxer_stream doesn't exist in ffmpeg_video_decoder.
BUG=90250
TEST=trybots
Review URL: http://codereview.chromium.org/7461045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93942 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | media/filters/ffmpeg_video_decoder.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc index e1aea55..381c566 100644 --- a/media/filters/ffmpeg_video_decoder.cc +++ b/media/filters/ffmpeg_video_decoder.cc @@ -47,6 +47,14 @@ void FFmpegVideoDecoder::Initialize(DemuxerStream* demuxer_stream, DCHECK(!demuxer_stream_); DCHECK(!initialize_callback_.get()); + if (!demuxer_stream) { + host()->SetError(PIPELINE_ERROR_DECODE); + callback->Run(); + delete callback; + delete stats_callback; + return; + } + demuxer_stream_ = demuxer_stream; initialize_callback_.reset(callback); statistics_callback_.reset(stats_callback); |