diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 19:57:32 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 19:57:32 +0000 |
| commit | b56e068deff08469f2f36c30a808de60fa07a31a (patch) | |
| tree | d30edc040e7e20b1f2aaec73013ff3a656536dec /third_party/ffmpeg | |
| parent | 7cba60c43caf11e5481fb3e488e8e6ffd9a9df0b (diff) | |
| download | chromium_src-b56e068deff08469f2f36c30a808de60fa07a31a.zip chromium_src-b56e068deff08469f2f36c30a808de60fa07a31a.tar.gz chromium_src-b56e068deff08469f2f36c30a808de60fa07a31a.tar.bz2 | |
Reenable ffmpegsumo, and also readd the use_system_ffmpeg flag.
BUG=22307
TEST=built.
Review URL: http://codereview.chromium.org/343064
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30621 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/ffmpeg')
| -rwxr-xr-x | third_party/ffmpeg/ffmpeg.gyp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp index 1b7d421..955cac4 100755 --- a/third_party/ffmpeg/ffmpeg.gyp +++ b/third_party/ffmpeg/ffmpeg.gyp @@ -25,6 +25,8 @@ 'ffmpeg_branding%': '<(branding)', 'ffmpeg_variant%': '<(target_arch)', + 'use_system_ffmpeg%': 0, + # Locations for generated artifacts. 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/ffmpeg', 'asm_library': 'ffmpegasm', @@ -36,7 +38,7 @@ # # TODO(ajwong): Per the comment above, reduce this conditional's size and # determine if in-tree build in Windows is tractable. - ['OS!="linux" or OS=="freebsd" or OS=="linux"', { + ['OS!="linux" or OS!="freebsd" or use_system_ffmpeg==0', { 'variables': { 'target_for_binaries': 'ffmpeg_binaries', 'ffmpeg_include_root': 'include', @@ -561,11 +563,6 @@ # TODO(ajwong): Clean this up after we've finished # migrating to in-tree build. 'source_files': [ - # TODO(ajwong): Temporary revert to make tree green while - # builder libraries are updated. - 'binaries/<(ffmpeg_bin_dir)/libavcodec.so.52', - 'binaries/<(ffmpeg_bin_dir)/libavformat.so.52', - 'binaries/<(ffmpeg_bin_dir)/libavutil.so.50', ], }, }], ['OS=="mac"', { |