media/filters/ffmpeg_video_decoder.cc - Issue 5970011: Revert 70077 - Don't uninitialize FFmpegVideoDecodeEngine if we haven't initi...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/filters/ffmpeg_video_decoder.cc

Issue 5970011: Revert 70077 - Don't uninitialize FFmpegVideoDecodeEngine if we haven't initi... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 10 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: media/filters/ffmpeg_video_decoder.cc

===================================================================

--- media/filters/ffmpeg_video_decoder.cc (revision 70091)

+++ media/filters/ffmpeg_video_decoder.cc (working copy)

@@ -97,7 +97,6 @@

config.opaque_context = av_stream;

config.width = width_;

config.height = height_;

- state_ = kInitializing;

decode_engine_->Initialize(message_loop(), this, NULL, config);

}

@@ -140,10 +139,7 @@

DCHECK(!uninitialize_callback_.get());

uninitialize_callback_.reset(callback);

- if (state_ != kUnInitialized)

- decode_engine_->Uninitialize();

- else

- OnUninitializeComplete();

+ decode_engine_->Uninitialize();

}

void FFmpegVideoDecoder::OnUninitializeComplete() {

« no previous file with comments | « media/filters/ffmpeg_video_decoder.h ('k') | media/filters/ffmpeg_video_decoder_unittest.cc » ('j') | no next file with comments »