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

Unified Diff: media/media.gyp

Issue 12302029: Linux: add a tool and code to make use_system_ffmpeg option more compatible (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: build/common.gypi Created 7 years, 10 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
« no previous file with comments | « media/ffmpeg/ffmpeg_common.cc ('k') | tools/compile_test/compile_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index f514dec48e5cc78567d141f20e2cb970a8707e92..75b62bebb503e2d9488bf0fc5cec3fd0a7e1916d 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -469,6 +469,18 @@
'filters/vpx_video_decoder.h',
],
}],
+ ['use_system_ffmpeg == 1', {
+ 'defines': [
+ '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
+ '--code "#include <libavcodec/avcodec.h>\n'
+ 'int test() { return CODEC_ID_OPUS; }" '
+ '--on-failure CHROMIUM_OMIT_CODEC_ID_OPUS)',
+ '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
+ '--code "#include <libavcodec/avcodec.h>\n'
+ 'int test() { return AV_CODEC_ID_VP9; }" '
+ '--on-failure CHROMIUM_OMIT_AV_CODEC_ID_VP9)',
+ ],
+ }],
['OS == "ios"', {
'includes': [
# For shared_memory_support_sources variable.
« no previous file with comments | « media/ffmpeg/ffmpeg_common.cc ('k') | tools/compile_test/compile_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698