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

Unified Diff: media/filters/ffmpeg_demuxer_factory.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 | « media/base/pipeline.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_demuxer_factory.cc
diff --git a/media/filters/ffmpeg_demuxer_factory.cc b/media/filters/ffmpeg_demuxer_factory.cc
index 0c5e40274dcf0fb5e1bed23ef9567196ff8cdb9b..13494b9bdbf9d1262c72e15bf31035201b96465a 100644
--- a/media/filters/ffmpeg_demuxer_factory.cc
+++ b/media/filters/ffmpeg_demuxer_factory.cc
@@ -22,11 +22,7 @@ FFmpegDemuxerFactory::~FFmpegDemuxerFactory() {}
static void DemuxerInitDone(const DemuxerFactory::BuildCallback& cb,
const scoped_refptr<FFmpegDemuxer>& demuxer,
PipelineStatus status) {
- if (status != PIPELINE_OK) {
- cb.Run(status, NULL);
- return;
- }
- cb.Run(PIPELINE_OK, demuxer);
+ cb.Run(status, demuxer);
}
void FFmpegDemuxerFactory::Build(const std::string& url,
« no previous file with comments | « media/base/pipeline.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698