Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(756)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/media/webkit_media.gypi

Issue 10899021: Add CDM video decoder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Compiles, does nothing. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« webkit/media/crypto/ppapi/content_decryption_module.h ('K') | « webkit/media/crypto/ppapi/content_decryption_module.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/webkit_media.gypi
diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi
index 7ac9b9b6da8fa6a412fcab4ab3b3740a81a90588..db9eab9e2c18cb3221fa3db5e042ab37504e6d35 100644
--- a/webkit/media/webkit_media.gypi
+++ b/webkit/media/webkit_media.gypi
@@ -89,11 +89,17 @@
'defines': ['CDM_IMPLEMENTATION'],
'dependencies': [
'<(DEPTH)/base/base.gyp:base',
- '<(DEPTH)/media/media.gyp:media'
+ '<(DEPTH)/media/media.gyp:media',
+ '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
],
'sources': [
'crypto/ppapi/clear_key_cdm.cc',
'crypto/ppapi/clear_key_cdm.h',
+ 'crypto/decoders/ffmpeg_util.cc',
+ 'crypto/decoders/ffmpeg_util.h',
+ 'crypto/decoders/ffmpeg_video_decoder.cc',
+ 'crypto/decoders/ffmpeg_video_decoder.h',
+ 'crypto/decoders/video_decoder.h',
],
},
{
« webkit/media/crypto/ppapi/content_decryption_module.h ('K') | « webkit/media/crypto/ppapi/content_decryption_module.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698