| Index: media/filters/ffmpeg_demuxer_factory.h
|
| diff --git a/media/filters/ffmpeg_demuxer_factory.h b/media/filters/ffmpeg_demuxer_factory.h
|
| index 8921531fd5b88f0a6b43ac53e71a71daff4c1f90..efb96786ff94f5b51c633eb30253cfb83cfd3730 100644
|
| --- a/media/filters/ffmpeg_demuxer_factory.h
|
| +++ b/media/filters/ffmpeg_demuxer_factory.h
|
| @@ -17,14 +17,13 @@ namespace media {
|
|
|
| class MEDIA_EXPORT FFmpegDemuxerFactory : public DemuxerFactory {
|
| public:
|
| - // Takes ownership of |data_source_factory|, but not of |loop|.
|
| - FFmpegDemuxerFactory(DataSourceFactory* data_source_factory,
|
| + FFmpegDemuxerFactory(scoped_ptr<DataSourceFactory> data_source_factory,
|
| MessageLoop* loop);
|
| virtual ~FFmpegDemuxerFactory();
|
|
|
| // DemuxerFactory methods.
|
| virtual void Build(const std::string& url, const BuildCallback& cb) OVERRIDE;
|
| - virtual DemuxerFactory* Clone() const OVERRIDE;
|
| + virtual scoped_ptr<DemuxerFactory> Clone() const OVERRIDE;
|
|
|
| private:
|
| scoped_ptr<DataSourceFactory> data_source_factory_;
|
|
|