Index: media/filters/dummy_demuxer.cc |
diff --git a/media/filters/dummy_demuxer.cc b/media/filters/dummy_demuxer.cc |
index d5692daca9bc74a162ca6421b7e06b0583117f74..b8513eb7649f4d7620f34fd3e00a7f0f1d1a841f 100644 |
--- a/media/filters/dummy_demuxer.cc |
+++ b/media/filters/dummy_demuxer.cc |
@@ -33,7 +33,8 @@ void DummyDemuxerStream::Read(const ReadCB& read_cb) {} |
void DummyDemuxerStream::EnableBitstreamConverter() {} |
DummyDemuxer::DummyDemuxer(bool has_video, bool has_audio, bool local_source) |
- : has_video_(has_video), |
+ : host_(NULL), |
+ has_video_(has_video), |
has_audio_(has_audio), |
local_source_(local_source) { |
streams_.resize(DemuxerStream::NUM_TYPES); |
@@ -47,7 +48,8 @@ DummyDemuxer::DummyDemuxer(bool has_video, bool has_audio, bool local_source) |
DummyDemuxer::~DummyDemuxer() {} |
-void DummyDemuxer::Initialize(const PipelineStatusCB& status_cb) { |
+void DummyDemuxer::Initialize(DemuxerHost* host, |
+ const PipelineStatusCB& status_cb) { |
status_cb.Run(PIPELINE_OK); |
} |
@@ -55,11 +57,6 @@ scoped_refptr<DemuxerStream> DummyDemuxer::GetStream(DemuxerStream::Type type) { |
return streams_[type]; |
} |
-void DummyDemuxer::set_host(DemuxerHost* demuxer_host) { |
- Demuxer::set_host(demuxer_host); |
- host()->SetDuration(media::kInfiniteDuration()); |
acolwell GONE FROM CHROMIUM
2012/04/04 16:01:00
Why don't we need this call anymore?
scherkus (not reviewing)
2012/04/05 01:54:53
whoops!
|
-} |
- |
base::TimeDelta DummyDemuxer::GetStartTime() const { |
return base::TimeDelta(); |
} |