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

Unified Diff: media/filters/ffmpeg_demuxer_factory.cc

Issue 6686061: PipelineError is dead. Long live PipelineStatus! (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Double-delete fix for PipelineStatusNotification 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
Index: media/filters/ffmpeg_demuxer_factory.cc
diff --git a/media/filters/ffmpeg_demuxer_factory.cc b/media/filters/ffmpeg_demuxer_factory.cc
index add2c54e689ffadbab29356ad527391b23fa8677..1bd4db1ee56fd0b83fae1b2e44538eca55ef4ad5 100644
--- a/media/filters/ffmpeg_demuxer_factory.cc
+++ b/media/filters/ffmpeg_demuxer_factory.cc
@@ -31,7 +31,7 @@ class DemuxerCallbackAsPipelineStatusCallback : public PipelineStatusCallback {
virtual ~DemuxerCallbackAsPipelineStatusCallback() {}
- virtual void RunWithParams(const Tuple1<PipelineError>& params) {
+ virtual void RunWithParams(const Tuple1<PipelineStatus>& params) {
cb_->Run(params.a, demuxer_);
}
@@ -54,8 +54,8 @@ class DemuxerCallbackAsDataSourceCallback :
virtual ~DemuxerCallbackAsDataSourceCallback() {}
- virtual void RunWithParams(const Tuple2<PipelineError, DataSource*>& params) {
- PipelineError status = params.a;
+ virtual void RunWithParams(const Tuple2<PipelineStatus, DataSource*>& params) {
+ PipelineStatus status = params.a;
DataSource* data_source = params.b;
if (status != PIPELINE_OK) {
cb_->Run(status, static_cast<Demuxer*>(NULL));

Powered by Google App Engine
This is Rietveld 408576698