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

Unified Diff: media/media.gyp

Issue 11953017: Revert 177842. This doesn't build in standalone webkit builds: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 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/filters/vpx_video_decoder.cc ('k') | webkit/media/filter_helpers.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
===================================================================
--- media/media.gyp (revision 177952)
+++ media/media.gyp (working copy)
@@ -13,11 +13,8 @@
['OS == "android" or OS == "ios"', {
# Android and iOS don't use ffmpeg.
'use_ffmpeg%': 0,
- # Android and iOS don't use libvpx.
- 'use_libvpx%': 0,
}, { # 'OS != "android" and OS != "ios"'
'use_ffmpeg%': 1,
- 'use_libvpx%': 1,
}],
],
},
@@ -316,8 +313,6 @@
'filters/video_frame_generator.h',
'filters/video_renderer_base.cc',
'filters/video_renderer_base.h',
- 'filters/vpx_video_decoder.cc',
- 'filters/vpx_video_decoder.h',
'video/capture/fake_video_capture_device.cc',
'video/capture/fake_video_capture_device.h',
'video/capture/linux/video_capture_device_linux.cc',
@@ -418,17 +413,6 @@
'webm/webm_stream_parser.h',
],
}],
- ['use_libvpx == 1', {
- 'dependencies': [
- '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
- ],
- }, { # use_libvpx == 0
- # Exclude the sources that depend on libvpx.
- 'sources!': [
- 'filters/vpx_video_decoder.cc',
- 'filters/vpx_video_decoder.h',
- ],
- }],
['OS == "ios"', {
'includes': [
# For shared_memory_support_sources variable.
« no previous file with comments | « media/filters/vpx_video_decoder.cc ('k') | webkit/media/filter_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698