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

Unified Diff: build/linux/unbundle/ffmpeg.gyp

Issue 14659007: Remove use_system_ffmpeg-related logic from media and other mainline gyp files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more removals Created 7 years, 7 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 | « build/common.gypi ('k') | media/base/media_posix.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/linux/unbundle/ffmpeg.gyp
diff --git a/build/linux/unbundle/ffmpeg.gyp b/build/linux/unbundle/ffmpeg.gyp
index dfaaf0aee83668764b07c97846a035c933c4110d..e3c3723894ceae651920154dbb65cf83aa4d3d40 100644
--- a/build/linux/unbundle/ffmpeg.gyp
+++ b/build/linux/unbundle/ffmpeg.gyp
@@ -10,6 +10,31 @@
'direct_dependent_settings': {
'cflags': [
'<!@(pkg-config --cflags libavcodec libavformat libavutil)',
+
+ '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
+ '--code "#define __STDC_CONSTANT_MACROS\n'
+ '#include <libavcodec/avcodec.h>\n'
+ 'int test() { return AV_CODEC_ID_OPUS; }" '
+ '--on-failure -DCHROMIUM_OMIT_AV_CODEC_ID_OPUS=1)',
+
+ '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
+ '--code "#define __STDC_CONSTANT_MACROS\n'
+ '#include <libavcodec/avcodec.h>\n'
+ 'int test() { return AV_CODEC_ID_VP9; }" '
+ '--on-failure -DCHROMIUM_OMIT_AV_CODEC_ID_VP9=1)',
+
+ '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
+ '--code "#define __STDC_CONSTANT_MACROS\n'
+ '#include <libavcodec/avcodec.h>\n'
+ 'int test() { return AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL; }" '
+ '--on-failure -DCHROMIUM_OMIT_AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL=1)',
+
+ '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
+ '--code "#define __STDC_CONSTANT_MACROS\n'
+ '#include <libavcodec/avcodec.h>\n'
+ 'int test() { struct AVFrame frame;\n'
+ 'return av_frame_get_channels(&frame); }" '
+ '--on-failure -DCHROMIUM_NO_AVFRAME_CHANNELS=1)',
],
'defines': [
'__STDC_CONSTANT_MACROS',
« no previous file with comments | « build/common.gypi ('k') | media/base/media_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698