| Index: media/base/filter_collection.cc
|
| diff --git a/media/base/filter_collection.cc b/media/base/filter_collection.cc
|
| index 317139954ac9f28ac2c339a11dd5e1e6561da765..537dd6032be127bc782437bb25775d73f0559b58 100644
|
| --- a/media/base/filter_collection.cc
|
| +++ b/media/base/filter_collection.cc
|
| @@ -13,13 +13,12 @@ FilterCollection::FilterCollection() {}
|
|
|
| FilterCollection::~FilterCollection() {}
|
|
|
| -void FilterCollection::SetDemuxerFactory(scoped_ptr<DemuxerFactory> factory) {
|
| - DCHECK(factory.get());
|
| - demuxer_factory_ = factory.Pass();
|
| +void FilterCollection::SetDemuxer(const scoped_refptr<Demuxer>& demuxer) {
|
| + demuxer_ = demuxer;
|
| }
|
|
|
| -DemuxerFactory* FilterCollection::GetDemuxerFactory() {
|
| - return demuxer_factory_.get();
|
| +const scoped_refptr<Demuxer>& FilterCollection::GetDemuxer() {
|
| + return demuxer_;
|
| }
|
|
|
| void FilterCollection::AddAudioDecoder(AudioDecoder* audio_decoder) {
|
|
|