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

Unified Diff: media/media.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: Created 7 years, 8 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
« build/linux/unbundle/ffmpeg.gyp ('K') | « media/ffmpeg/ffmpeg_common.cc ('k') | no next file » | 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 f447379728e2c0f449a6c61161b1f0061bf54609..44fa22d1bf46a6764bbef0a981dc576fc9ecea42 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -509,28 +509,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.
« build/linux/unbundle/ffmpeg.gyp ('K') | « media/ffmpeg/ffmpeg_common.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698