diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-12 00:17:08 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-12 00:17:08 +0000 |
| commit | f284f57828e03251b44e6468b133b94639199651 (patch) | |
| tree | 41f26536086976ec8e5bc5090f2f95ab96244b5d /third_party/ffmpeg | |
| parent | d7d7c34f4ff74f52ce30d4d878b57ce845c877e4 (diff) | |
| download | chromium_src-f284f57828e03251b44e6468b133b94639199651.zip chromium_src-f284f57828e03251b44e6468b133b94639199651.tar.gz chromium_src-f284f57828e03251b44e6468b133b94639199651.tar.bz2 | |
Delay loading FFmpeg dlls from the test_shell
Make test_shell.vsprops depends on using_ffmpeg.vsprops
so it delays loading FFmpeg dlls.
Review URL: http://codereview.chromium.org/125015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18231 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/ffmpeg')
| -rwxr-xr-x | third_party/ffmpeg/ffmpeg.gyp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp index 427e541..ca33041 100755 --- a/third_party/ffmpeg/ffmpeg.gyp +++ b/third_party/ffmpeg/ffmpeg.gyp @@ -86,6 +86,11 @@ '<(output_dir)/avutil-50.lib', ], }, + 'msvs_settings': { + 'VCLinkerTool': { + 'DelayLoadDLLs': 'avcodec-52.dll,avformat-52.dll,avutil-50.dll', + }, + }, }, 'rules': [ { |