media/filters/decoder_selector.cc - Issue 395703002: Fold {Audio|Video}Decoder::Stop() into the dtor.

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/decoder_selector.cc

Issue 395703002: Fold {Audio|Video}Decoder::Stop() into the dtor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: minor fixes Created 6 years, 5 months ago

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

Jump to:

Index: media/filters/decoder_selector.cc

diff --git a/media/filters/decoder_selector.cc b/media/filters/decoder_selector.cc

index fbd6d01741c8967dedd10fdd777b3b616ae0f11c..077aed0d80b0a8fa889ae4c1671934c9eb740b46 100644

--- a/media/filters/decoder_selector.cc

+++ b/media/filters/decoder_selector.cc

@@ -130,7 +130,7 @@ void DecoderSelector<StreamType>::Abort() {

if (decoder_) {

// |decrypted_stream_| is either NULL or already initialized. We don't

// need to Stop() |decrypted_stream_| in either case.

- decoder_->Stop();

+ decoder_.reset();

ReturnNullDecoder();

return;

}