diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-18 04:17:09 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-18 04:17:09 +0000 |
| commit | 046ba37097752ae25fdd0a520d6c4d77a2fb83e7 (patch) | |
| tree | 2aa1c73af69b34a1c22502a2995db761e974defc /media/tools | |
| parent | a6b556bb8326f9f99da927bf250d5e259be543ab (diff) | |
| download | chromium_src-046ba37097752ae25fdd0a520d6c4d77a2fb83e7.zip chromium_src-046ba37097752ae25fdd0a520d6c4d77a2fb83e7.tar.gz chromium_src-046ba37097752ae25fdd0a520d6c4d77a2fb83e7.tar.bz2 | |
Encrypted Media: Old video decrypt-only path clean-up.
- Remove decryptor from FFmpegVideoDecoder.
- Remove all decryption functionality from ProxyDecryptor.
TBR=jam@chromium.org
BUG=141786
TEST=this removes an obsolete code path and should not affect any exitst test/functionality.
Review URL: https://codereview.chromium.org/11587002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173640 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools')
| -rw-r--r-- | media/tools/player_x11/player_x11.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc index c7cafd7..8c76e17 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -115,7 +115,7 @@ bool InitPipeline(const scoped_refptr<base::MessageLoopProxy>& message_loop, collection->GetAudioDecoders()->push_back(new media::FFmpegAudioDecoder( message_loop)); collection->GetVideoDecoders()->push_back(new media::FFmpegVideoDecoder( - message_loop, NULL)); + message_loop)); // Create our video renderer and save a reference to it for painting. g_video_renderer = new media::VideoRendererBase( |