Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1507)

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: rebase only 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/audio_renderer_impl_unittest.cc ('k') | media/filters/decoder_stream.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « media/filters/audio_renderer_impl_unittest.cc ('k') | media/filters/decoder_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698