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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/media/webkit_media.gypi

Issue 11316045: Add a libvpx video decoder to ClearKeyCdm and move the fake video decoder to its own class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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_decoder.cc ('K') | « webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.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 81b770c5af4a0da6cc3cf95f9d3722a43f740a6a..f5e63de8189fd69c351400366a8861424ecff5d9 100644
--- a/webkit/media/webkit_media.gypi
+++ b/webkit/media/webkit_media.gypi
@@ -117,6 +117,8 @@
'defines': ['CLEAR_KEY_CDM_USE_FFMPEG_DECODER'],
'dependencies': [
'<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+ # TODO(tomfinegan): This does not belong in the |use_ffmpeg| block.
+ '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
],
'sources': [
'crypto/ppapi/ffmpeg_cdm_audio_decoder.cc',
« webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.cc ('K') | « webkit/media/crypto/ppapi/ffmpeg_cdm_video_decoder.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698