diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-01 18:23:17 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-01 18:23:17 +0000 |
| commit | 2a122adcdb2cc0e760e45db988ef1817cebcc61b (patch) | |
| tree | c1efda7cfd451659dfabe5c19c9347116fb96137 | |
| parent | 990cff1bb03e37a466664bed842de631e5ca0e16 (diff) | |
| download | chromium_src-2a122adcdb2cc0e760e45db988ef1817cebcc61b.zip chromium_src-2a122adcdb2cc0e760e45db988ef1817cebcc61b.tar.gz chromium_src-2a122adcdb2cc0e760e45db988ef1817cebcc61b.tar.bz2 | |
Make FFmpeg delay load settings propagate to all shared libraries and executables.
TEST=everything should build with no test hangs
BUG=15664
Review URL: http://codereview.chromium.org/151124
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19746 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/chrome.gyp | 5 | ||||
| -rw-r--r-- | media/media.gyp | 6 | ||||
| -rwxr-xr-x | third_party/ffmpeg/ffmpeg.gyp | 16 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gyp | 1 |
4 files changed, 8 insertions, 20 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 47504a4..c361c94 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -3180,7 +3180,6 @@ '../build/temp_gyp/googleurl.gyp:googleurl', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', - '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', '../third_party/icu38/icu38.gyp:icui18n', '../third_party/icu38/icu38.gyp:icuuc', '../third_party/libxml/libxml.gyp:libxml', @@ -3347,7 +3346,6 @@ '../skia/skia.gyp:skia', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', - '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', '../third_party/icu38/icu38.gyp:icui18n', '../third_party/icu38/icu38.gyp:icuuc', '../third_party/libxml/libxml.gyp:libxml', @@ -4169,7 +4167,6 @@ '../third_party/bzip2/bzip2.gyp:*', '../third_party/cld/cld.gyp:cld', '../third_party/codesighs/codesighs.gyp:*', - '../third_party/ffmpeg/ffmpeg.gyp:*', '../third_party/icu38/icu38.gyp:*', '../third_party/libjpeg/libjpeg.gyp:*', '../third_party/libpng/libpng.gyp:*', @@ -4217,7 +4214,6 @@ '../net/net.gyp:net_resources', '../build/util/support/support.gyp:*', '../third_party/cld/cld.gyp:cld', - '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', '../views/views.gyp:views', '../webkit/webkit.gyp:webkit_resources', @@ -4574,7 +4570,6 @@ 'third_party/hunspell/hunspell.gyp:hunspell', '../net/net.gyp:net_resources', '../skia/skia.gyp:skia', - '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', '../third_party/icu38/icu38.gyp:icui18n', '../third_party/libpng/libpng.gyp:libpng', '../third_party/libxml/libxml.gyp:libxml', diff --git a/media/media.gyp b/media/media.gyp index 2947683..39751e2 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -202,16 +202,10 @@ 'dependencies': [ 'media', '../base/base.gyp:base', - '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', ], 'include_dirs': [ '../chrome/third_party/wtl/include', ], - 'dependencies': [ - 'media', - '../base/base.gyp:base', - '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', - ], 'sources': [ 'player/list.h', 'player/mainfrm.h', diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp index 9616d17..0d50a5d 100755 --- a/third_party/ffmpeg/ffmpeg.gyp +++ b/third_party/ffmpeg/ffmpeg.gyp @@ -85,14 +85,14 @@ '<(output_dir)/avformat-52.lib', '<(output_dir)/avutil-50.lib', ], - }, - 'msvs_settings': { - 'VCLinkerTool': { - 'DelayLoadDLLs': [ - 'avcodec-52.dll', - 'avformat-52.dll', - 'avutil-50.dll', - ], + 'msvs_settings': { + 'VCLinkerTool': { + 'DelayLoadDLLs': [ + 'avcodec-52.dll', + 'avformat-52.dll', + 'avutil-50.dll', + ], + }, }, }, }, diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index 8780845..eb146d9 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -182,7 +182,6 @@ 'msvs_guid': 'FA39524D-3067-4141-888D-28A86C66F2B9', 'dependencies': [ 'test_shell_common', - '../../../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', ], 'sources': [ 'test_shell_main.cc', |