diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-07 16:59:00 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-07 16:59:00 +0000 |
| commit | f422d8707d987d992dfdcdab63b595627b6379a8 (patch) | |
| tree | f0888ba6c47f4df67ef1654241215cd173a503c2 /build | |
| parent | c88c356ceff3d127afd6a07b8df4b66752e5ca82 (diff) | |
| download | chromium_src-f422d8707d987d992dfdcdab63b595627b6379a8.zip chromium_src-f422d8707d987d992dfdcdab63b595627b6379a8.tar.gz chromium_src-f422d8707d987d992dfdcdab63b595627b6379a8.tar.bz2 | |
Remove use_system_ffmpeg-related logic from media and other mainline gyp files.
BUG=226860
R=fischman@chromium.org
Review URL: https://codereview.chromium.org/14659007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198746 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 3 | ||||
| -rw-r--r-- | build/linux/unbundle/ffmpeg.gyp | 25 |
2 files changed, 25 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi index 9767abb..f9a53b0 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -799,9 +799,6 @@ 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)', 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)', - # Use system ffmpeg instead of bundled one. - 'use_system_ffmpeg%': 0, - # Use system mesa instead of bundled one. 'use_system_mesa%': 0, diff --git a/build/linux/unbundle/ffmpeg.gyp b/build/linux/unbundle/ffmpeg.gyp index dfaaf0a..e3c3723 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', |