Index: media/filters/ffmpeg_demuxer.h |
diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h |
index 711e609b92bfde2930b828ddefdffda53091785d..c26664e2a4fbd0a16f9d85c821a965806751f919 100644 |
--- a/media/filters/ffmpeg_demuxer.h |
+++ b/media/filters/ffmpeg_demuxer.h |
@@ -130,16 +130,16 @@ class FFmpegDemuxerStream : public DemuxerStream { |
class MEDIA_EXPORT FFmpegDemuxer : public Demuxer, public FFmpegURLProtocol { |
public: |
- FFmpegDemuxer(MessageLoop* message_loop, bool local_source); |
+ FFmpegDemuxer(MessageLoop* message_loop, |
+ const scoped_refptr<DataSource>& data_source, |
+ bool local_source); |
virtual ~FFmpegDemuxer(); |
// Posts a task to perform additional demuxing. |
virtual void PostDemuxTask(); |
- void Initialize( |
- DataSource* data_source, const PipelineStatusCB& status_cb); |
- |
// Demuxer implementation. |
+ virtual void Initialize(const PipelineStatusCB& status_cb) OVERRIDE; |
virtual void Stop(const base::Closure& callback) OVERRIDE; |
virtual void Seek(base::TimeDelta time, const PipelineStatusCB& cb) OVERRIDE; |
virtual void OnAudioRendererDisabled() OVERRIDE; |
@@ -171,8 +171,7 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer, public FFmpegURLProtocol { |
FRIEND_TEST_ALL_PREFIXES(FFmpegDemuxerTest, ProtocolRead); |
// Carries out initialization on the demuxer thread. |
- void InitializeTask( |
- DataSource* data_source, const PipelineStatusCB& status_cb); |
+ void InitializeTask(const PipelineStatusCB& status_cb); |
// Carries out a seek on the demuxer thread. |
void SeekTask(base::TimeDelta time, const PipelineStatusCB& cb); |