summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-02 20:15:57 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-02 20:15:57 +0000
commit00cd9c4e71d1e6dd6cc3a2fff60505479304c9d1 (patch)
treeeb61d6402a5e967e5eb1d41dfde730af48dfa55f /media
parentd9b888cdf9ad654a3f2e5c22b935e68db77a71ef (diff)
downloadchromium_src-00cd9c4e71d1e6dd6cc3a2fff60505479304c9d1.zip
chromium_src-00cd9c4e71d1e6dd6cc3a2fff60505479304c9d1.tar.gz
chromium_src-00cd9c4e71d1e6dd6cc3a2fff60505479304c9d1.tar.bz2
Convert implicit scoped_refptr constructor calls to explicit ones, part 2
This CL was created automatically by this clang rewriter: http://codereview.appspot.com/2826041 I then did quite a bit of manual editing to fix style issues. BUG=28083 TEST=None Review URL: http://codereview.chromium.org/4291001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64798 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/base/pipeline_impl.cc2
-rw-r--r--media/filters/ffmpeg_demuxer.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc
index 2128c34..214be7d0 100644
--- a/media/base/pipeline_impl.cc
+++ b/media/base/pipeline_impl.cc
@@ -1027,7 +1027,7 @@ void PipelineImpl::PrepareFilter(scoped_refptr<MediaFilter> filter) {
DCHECK(filter_types_.find(filter->filter_type()) == filter_types_.end())
<< "Filter type " << filter->filter_type() << " already exists";
filter->set_host(this);
- filters_.push_back(filter.get());
+ filters_.push_back(make_scoped_refptr(filter.get()));
filter_types_[filter->filter_type()] = filter.get();
}
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index 658bd8a..e966c7b 100644
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -447,8 +447,8 @@ void FFmpegDemuxer::InitializeTask(DataSource* data_source,
= new FFmpegDemuxerStream(this, stream);
DCHECK(demuxer_stream);
- streams_.push_back(demuxer_stream);
- packet_streams_.push_back(demuxer_stream);
+ streams_.push_back(make_scoped_refptr(demuxer_stream));
+ packet_streams_.push_back(make_scoped_refptr(demuxer_stream));
max_duration = std::max(max_duration, demuxer_stream->duration());
} else {
packet_streams_.push_back(NULL);