summaryrefslogtreecommitdiffstats
path: root/media/media.gyp
diff options
context:
space:
mode:
authorxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-19 20:06:18 +0000
committerxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-19 20:06:18 +0000
commit3942cc79573bf0234b43f49f0ae90571698d8067 (patch)
tree91b7b971049f05336728b0d96ec200539001c27d /media/media.gyp
parentcbd9de3af676b13af875bf52980ace4ad8a576e0 (diff)
downloadchromium_src-3942cc79573bf0234b43f49f0ae90571698d8067.zip
chromium_src-3942cc79573bf0234b43f49f0ae90571698d8067.tar.gz
chromium_src-3942cc79573bf0234b43f49f0ae90571698d8067.tar.bz2
Add Decryptor interface.
This is in preparation for the ProxyDecryptor and PpapiDecryptor. BUG=123260 TEST=media_unittests, media layout tests Review URL: https://chromiumcodereview.appspot.com/10539150 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143030 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
-rw-r--r--media/media.gyp3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/media.gyp b/media/media.gyp
index 498006e..0d60e6b 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -148,6 +148,8 @@
'base/decoder_buffer.h',
'base/decrypt_config.cc',
'base/decrypt_config.h',
+ 'base/decryptor.h',
+ 'base/decryptor_client.h',
'base/demuxer.cc',
'base/demuxer.h',
'base/demuxer_stream.cc',
@@ -196,7 +198,6 @@
'base/video_util.h',
'crypto/aes_decryptor.cc',
'crypto/aes_decryptor.h',
- 'crypto/decryptor_client.h',
'ffmpeg/ffmpeg_common.cc',
'ffmpeg/ffmpeg_common.h',
'ffmpeg/file_protocol.cc',