| Index: media/tools/player_wtl/movie.cc
|
| diff --git a/media/tools/player_wtl/movie.cc b/media/tools/player_wtl/movie.cc
|
| index 043932eef2273d68d1100aa64c371f92f7535568..68b2549b61358f2985dc37417ef7738cb117b7c9 100644
|
| --- a/media/tools/player_wtl/movie.cc
|
| +++ b/media/tools/player_wtl/movie.cc
|
| @@ -72,8 +72,10 @@ bool Movie::Open(const wchar_t* url, VideoRendererBase* video_renderer) {
|
|
|
| // Create filter collection.
|
| scoped_ptr<FilterCollection> collection(new FilterCollection());
|
| - collection->SetDemuxerFactory(new FFmpegDemuxerFactory(
|
| - new FileDataSourceFactory(), pipeline_loop));
|
| + collection->SetDemuxerFactory(
|
| + scoped_ptr<DemuxerFactory>(new FFmpegDemuxerFactory(
|
| + scoped_ptr<DataSourceFactory>(new FileDataSourceFactory()),
|
| + pipeline_loop)));
|
| collection->AddAudioDecoder(new FFmpegAudioDecoder(
|
| message_loop_factory_->GetMessageLoop("AudioDecoderThread")));
|
| collection->AddVideoDecoder(new FFmpegVideoDecoder(
|
| @@ -89,7 +91,7 @@ bool Movie::Open(const wchar_t* url, VideoRendererBase* video_renderer) {
|
|
|
| // Create and start our pipeline.
|
| media::PipelineStatusNotification note;
|
| - pipeline_->Start(collection.release(), WideToUTF8(std::wstring(url)),
|
| + pipeline_->Start(collection.Pass(), WideToUTF8(string16(url)),
|
| note.Callback());
|
| // Wait until the pipeline is fully initialized.
|
| note.Wait();
|
|
|