diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 20:15:42 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 20:15:42 +0000 |
| commit | 07414c07db19945852775924302cc0f54669a9f6 (patch) | |
| tree | 867d36671253e33c1f5c818044b80756dd31f44b | |
| parent | 24833fbccd01c2f23cd4272c620877cd59dbc5d9 (diff) | |
| download | chromium_src-07414c07db19945852775924302cc0f54669a9f6.zip chromium_src-07414c07db19945852775924302cc0f54669a9f6.tar.gz chromium_src-07414c07db19945852775924302cc0f54669a9f6.tar.bz2 | |
Remove FFmpegVideoDecoder log spam and misleading comment.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/9705045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126977 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | media/filters/ffmpeg_video_decoder.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc index e68ff84..845fed5 100644 --- a/media/filters/ffmpeg_video_decoder.cc +++ b/media/filters/ffmpeg_video_decoder.cc @@ -72,19 +72,14 @@ void FFmpegVideoDecoder::Initialize(DemuxerStream* demuxer_stream, if (!message_loop_) { message_loop_ = message_loop_factory_cb_.Run(); message_loop_factory_cb_.Reset(); - } else { - // TODO(scherkus): initialization currently happens more than once in - // PipelineIntegrationTest.BasicPlayback. - LOG(ERROR) << "Initialize has already been called."; - } - if (MessageLoop::current() != message_loop_) { message_loop_->PostTask(FROM_HERE, base::Bind( &FFmpegVideoDecoder::Initialize, this, make_scoped_refptr(demuxer_stream), pipeline_status_cb, statistics_cb)); return; } + DCHECK_EQ(MessageLoop::current(), message_loop_); DCHECK(!demuxer_stream_); if (!demuxer_stream) { |