From 046ba37097752ae25fdd0a520d6c4d77a2fb83e7 Mon Sep 17 00:00:00 2001 From: "xhwang@chromium.org" Date: Tue, 18 Dec 2012 04:17:09 +0000 Subject: 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 --- media/tools/player_x11/player_x11.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'media/tools') 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& 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( -- cgit v1.1