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: Address more comments. Created 8 years, 2 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/ffmpeg_cdm_video_frame.cc ('K') | « webkit/media/crypto/ppapi/ffmpeg_cdm_video_frame.cc ('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 62f9808903ab2ba42cb4f6672265d76382f6851f..756fe976a17b3179bc85fceb3749c43f4d0aaea8 100644
--- a/webkit/media/webkit_media.gypi
+++ b/webkit/media/webkit_media.gypi
@@ -105,11 +105,16 @@
'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/ppapi/ffmpeg_cdm_video_decoder.cc',
+ 'crypto/ppapi/ffmpeg_cdm_video_decoder.h',
+ 'crypto/ppapi/ffmpeg_cdm_video_frame.cc',
+ 'crypto/ppapi/ffmpeg_cdm_video_frame.h',
],
},
{
« webkit/media/crypto/ppapi/ffmpeg_cdm_video_frame.cc ('K') | « webkit/media/crypto/ppapi/ffmpeg_cdm_video_frame.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698