summaryrefslogtreecommitdiffstats
path: root/media/tools
diff options
context:
space:
mode:
Diffstat (limited to 'media/tools')
-rw-r--r--media/tools/player_wtl/movie.cc4
-rw-r--r--media/tools/player_x11/player_x11.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/media/tools/player_wtl/movie.cc b/media/tools/player_wtl/movie.cc
index 984cff1..ed162ce 100644
--- a/media/tools/player_wtl/movie.cc
+++ b/media/tools/player_wtl/movie.cc
@@ -79,11 +79,11 @@ bool Movie::Open(const wchar_t* url, VideoRendererBase* video_renderer) {
collection->AddAudioDecoder(new FFmpegAudioDecoder(
base::Bind(&MessageLoopFactory::GetMessageLoop,
base::Unretained(message_loop_factory_.get()),
- media::MessageLoopFactory::kAudioDecoder)));
+ media::MessageLoopFactory::kDecoder)));
collection->GetVideoDecoders()->push_back(new FFmpegVideoDecoder(
base::Bind(&MessageLoopFactory::GetMessageLoop,
base::Unretained(message_loop_factory_.get()),
- media::MessageLoopFactory::kVideoDecoder),
+ media::MessageLoopFactory::kDecoder),
NULL));
// TODO(vrk): Re-enabled audio. (crbug.com/112159)
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc
index d65389d..fd30b9a 100644
--- a/media/tools/player_x11/player_x11.cc
+++ b/media/tools/player_x11/player_x11.cc
@@ -120,11 +120,11 @@ bool InitPipeline(const scoped_refptr<base::MessageLoopProxy>& message_loop,
collection->AddAudioDecoder(new media::FFmpegAudioDecoder(
base::Bind(&media::MessageLoopFactory::GetMessageLoop,
base::Unretained(message_loop_factory),
- media::MessageLoopFactory::kAudioDecoder)));
+ media::MessageLoopFactory::kDecoder)));
collection->GetVideoDecoders()->push_back(new media::FFmpegVideoDecoder(
base::Bind(&media::MessageLoopFactory::GetMessageLoop,
base::Unretained(message_loop_factory),
- media::MessageLoopFactory::kVideoDecoder),
+ media::MessageLoopFactory::kDecoder),
NULL));
// Create our video renderer and save a reference to it for painting.