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

Unified Diff: media/filters/ffmpeg_demuxer.h

Issue 6686061: PipelineError is dead. Long live PipelineStatus! (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: responses to 2nd CR Created 9 years, 9 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_status.h ('k') | 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/filters/ffmpeg_demuxer.h
diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h
index e47be5ed92ffed9932a9eba2a514244422d2b759..3816a011f4cdad2a473333530eda9ea9248c3fa4 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -234,7 +234,7 @@ class FFmpegDemuxer : public Demuxer,
// Initialization can happen before set_host() is called, in which case we
// store these bits for deferred reporting to the FilterHost when we get one.
base::TimeDelta max_duration_;
- PipelineError deferred_status_;
+ PipelineStatus deferred_status_;
DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer);
};
« no previous file with comments | « media/base/pipeline_status.h ('k') | media/filters/ffmpeg_demuxer_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698