diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-29 15:13:13 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-29 15:13:13 +0000 |
| commit | 57c9ae399f80f00b533aa92c9eafeee748aa3b1c (patch) | |
| tree | db5b26fc3e9090edda0c370dfdcb6790058611f3 /media/tools | |
| parent | 8238dd6190819daade7ee98f669e23a5a56ee4fa (diff) | |
| download | chromium_src-57c9ae399f80f00b533aa92c9eafeee748aa3b1c.zip chromium_src-57c9ae399f80f00b533aa92c9eafeee748aa3b1c.tar.gz chromium_src-57c9ae399f80f00b533aa92c9eafeee748aa3b1c.tar.bz2 | |
Remove AdaptiveDemuxer since it's been replaced with ChunkingDemuxer.
BUG=none
TEST=trybots
Review URL: http://codereview.chromium.org/8065023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103279 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools')
| -rw-r--r-- | media/tools/player_wtl/movie.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/media/tools/player_wtl/movie.cc b/media/tools/player_wtl/movie.cc index 58b6f0b..ad6c704 100644 --- a/media/tools/player_wtl/movie.cc +++ b/media/tools/player_wtl/movie.cc @@ -11,7 +11,6 @@ #include "media/base/media_log.h" #include "media/base/message_loop_factory_impl.h" #include "media/base/pipeline_impl.h" -#include "media/filters/adaptive_demuxer.h" #include "media/filters/audio_renderer_impl.h" #include "media/filters/ffmpeg_audio_decoder.h" #include "media/filters/ffmpeg_demuxer_factory.h" @@ -20,7 +19,6 @@ #include "media/filters/null_audio_renderer.h" #include "media/tools/player_wtl/wtl_renderer.h" -using media::AdaptiveDemuxerFactory; using media::AudioRendererImpl; using media::FFmpegAudioDecoder; using media::FFmpegDemuxerFactory; @@ -72,8 +70,8 @@ bool Movie::Open(const wchar_t* url, WtlVideoRenderer* video_renderer) { // Create filter collection. scoped_ptr<FilterCollection> collection(new FilterCollection()); - collection->SetDemuxerFactory(new AdaptiveDemuxerFactory( - new FFmpegDemuxerFactory(new FileDataSourceFactory(), pipeline_loop))); + collection->SetDemuxerFactory(new FFmpegDemuxerFactory( + new FileDataSourceFactory(), pipeline_loop)); collection->AddAudioDecoder(new FFmpegAudioDecoder( message_loop_factory_->GetMessageLoop("AudioDecoderThread"))); collection->AddVideoDecoder(new FFmpegVideoDecoder( |