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 /media/media.gyp | |
| 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 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/media/media.gyp b/media/media.gyp index 5f38e3e..557d118 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -510,28 +510,6 @@ 'filters/vpx_video_decoder.h', ], }], - ['use_system_ffmpeg == 1', { - 'cflags': [ - '<!(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() { struct AVFrame frame;\n' - 'return av_frame_get_channels(&frame); }" ' - '--on-failure -DCHROMIUM_NO_AVFRAME_CHANNELS=1)', - ], - }], ['OS == "ios"', { 'includes': [ # For shared_memory_support_sources variable. |