media/filters/ffmpeg_demuxer_factory.h - Issue 9015015: Take advantage of the new Pass() machinery on scoped_ptr{,_malloc}.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/filters/ffmpeg_demuxer_factory.h

Issue 9015015: Take advantage of the new Pass() machinery on scoped_ptr{,_malloc}. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebased & removed unnecessary include of ffmpeg_common.h from ffmpeg_demuxer.h Created 8 years, 12 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:

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_;