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 /third_party | |
| 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
Diffstat (limited to 'third_party')
| -rwxr-xr-x | third_party/ffmpeg/ffmpeg.gyp | 16 |
1 files changed, 8 insertions, 8 deletions
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', + ], + }, }, }, }, |