| Index: media/filters/pipeline_integration_test_base.cc
|
| diff --git a/media/filters/pipeline_integration_test_base.cc b/media/filters/pipeline_integration_test_base.cc
|
| index 7c1cc5de5b2d6efbbd65680b02e9209706260561..9e3c6a916daf07b144a529eb275d441b5297086f 100644
|
| --- a/media/filters/pipeline_integration_test_base.cc
|
| +++ b/media/filters/pipeline_integration_test_base.cc
|
| @@ -197,16 +197,17 @@ PipelineIntegrationTestBase::CreateFilterCollection(
|
| Decryptor* decryptor) {
|
| scoped_ptr<FilterCollection> collection(new FilterCollection());
|
| collection->SetDemuxer(demuxer);
|
| - collection->AddAudioDecoder(new FFmpegAudioDecoder(
|
| + scoped_refptr<AudioDecoder> audio_decoder = new FFmpegAudioDecoder(
|
| base::Bind(&MessageLoopFactory::GetMessageLoop,
|
| base::Unretained(message_loop_factory_.get()),
|
| - media::MessageLoopFactory::kDecoder)));
|
| - scoped_refptr<VideoDecoder> decoder = new FFmpegVideoDecoder(
|
| + media::MessageLoopFactory::kDecoder));
|
| + scoped_refptr<VideoDecoder> video_decoder = new FFmpegVideoDecoder(
|
| base::Bind(&MessageLoopFactory::GetMessageLoop,
|
| base::Unretained(message_loop_factory_.get()),
|
| media::MessageLoopFactory::kDecoder),
|
| decryptor);
|
| - collection->GetVideoDecoders()->push_back(decoder);
|
| + collection->GetAudioDecoders()->push_back(audio_decoder);
|
| + collection->GetVideoDecoders()->push_back(video_decoder);
|
|
|
| // Disable frame dropping if hashing is enabled.
|
| renderer_ = new VideoRendererBase(
|
|
|