diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 20:35:18 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 20:35:18 +0000 |
| commit | dd8f39cb3594276d7fc54c208f1b9c153fa11161 (patch) | |
| tree | 3c4bb134e0c2aaf87ec8b0e4906ded9a35881dad /webkit/media/webmediaplayer_proxy.cc | |
| parent | 34a868e3f512c5076cd22a2e2c1916c4a7b2230c (diff) | |
| download | chromium_src-dd8f39cb3594276d7fc54c208f1b9c153fa11161.zip chromium_src-dd8f39cb3594276d7fc54c208f1b9c153fa11161.tar.gz chromium_src-dd8f39cb3594276d7fc54c208f1b9c153fa11161.tar.bz2 | |
Expose decryptor to WebMediaPlayerImpl.
With this patch, we can to pass AddKey from WebKit (via WebMediaPlayerImpl) to the real decryptor in FFmpegVideoDecoder.
Patch by xhwang@chromium.org:
https://chromiumcodereview.appspot.com/9706064/
BUG=117063
TEST=media_unittests
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129922 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media/webmediaplayer_proxy.cc')
| -rw-r--r-- | webkit/media/webmediaplayer_proxy.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/webkit/media/webmediaplayer_proxy.cc b/webkit/media/webmediaplayer_proxy.cc index 3317b85..f6984f0 100644 --- a/webkit/media/webmediaplayer_proxy.cc +++ b/webkit/media/webmediaplayer_proxy.cc @@ -81,6 +81,7 @@ void WebMediaPlayerProxy::Detach() { webmediaplayer_ = NULL; data_source_ = NULL; frame_provider_ = NULL; + video_decoder_ = NULL; } void WebMediaPlayerProxy::PipelineInitializationCallback( |