diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-07 16:44:53 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-07 16:44:53 +0000 |
| commit | d46aea53a359567b853559c9e557c4aa6176148d (patch) | |
| tree | 51f514c1ecb0b0f3570962787012aea5258837bd /media/tools | |
| parent | b7c4f0378030eaacfc3a52218517d9340137ca59 (diff) | |
| download | chromium_src-d46aea53a359567b853559c9e557c4aa6176148d.zip chromium_src-d46aea53a359567b853559c9e557c4aa6176148d.tar.gz chromium_src-d46aea53a359567b853559c9e557c4aa6176148d.tar.bz2 | |
Remove WebMediaPlayerProxy::video_decoder_ & FFmpegVideoDecoder::set_decryptor.
BUG=None
Review URL: https://chromiumcodereview.appspot.com/10834183
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150360 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools')
| -rw-r--r-- | media/tools/player_wtl/movie.cc | 3 | ||||
| -rw-r--r-- | media/tools/player_x11/player_x11.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/media/tools/player_wtl/movie.cc b/media/tools/player_wtl/movie.cc index 45bea9b..eb117ba 100644 --- a/media/tools/player_wtl/movie.cc +++ b/media/tools/player_wtl/movie.cc @@ -80,7 +80,8 @@ bool Movie::Open(const wchar_t* url, VideoRendererBase* video_renderer) { collection->AddVideoDecoder(new FFmpegVideoDecoder( base::Bind(&MessageLoopFactory::GetMessageLoop, base::Unretained(message_loop_factory_.get()), - "VideoDecoderThread"))); + "VideoDecoderThread"), + NULL)); // TODO(vrk): Re-enabled audio. (crbug.com/112159) collection->AddAudioRenderer( diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc index df05d9d..85f3fb67 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -122,7 +122,8 @@ bool InitPipeline(MessageLoop* message_loop, collection->AddVideoDecoder(new media::FFmpegVideoDecoder( base::Bind(&media::MessageLoopFactory::GetMessageLoop, base::Unretained(message_loop_factory), - "VideoDecoderThread"))); + "VideoDecoderThread"), + NULL)); // Create our video renderer and save a reference to it for painting. g_video_renderer = new media::VideoRendererBase( |