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

Unified Diff: media/base/pipeline.cc

Issue 9350004: Fix incomplete teardown of demuxer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: CHECK. Created 8 years, 10 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 | « no previous file | media/filters/ffmpeg_demuxer_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/pipeline.cc
diff --git a/media/base/pipeline.cc b/media/base/pipeline.cc
index 0f268c967efeb3f2759af823991d92d0adec412e..95d1de8ed284329a58248eb9d7b4368ada2cc6ce 100644
--- a/media/base/pipeline.cc
+++ b/media/base/pipeline.cc
@@ -1137,17 +1137,13 @@ void Pipeline::OnDemuxerBuilt(PipelineStatus status, Demuxer* demuxer) {
return;
}
+ demuxer_ = demuxer;
if (status != PIPELINE_OK) {
SetError(status);
return;
}
- if (!demuxer) {
- SetError(PIPELINE_ERROR_REQUIRED_FILTER_MISSING);
- return;
- }
-
- demuxer_ = demuxer;
+ CHECK(demuxer_) << "Null demuxer encountered despite PIPELINE_OK.";
demuxer_->set_host(this);
{
« no previous file with comments | « no previous file | media/filters/ffmpeg_demuxer_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698