summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-01 18:23:17 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-01 18:23:17 +0000
commit2a122adcdb2cc0e760e45db988ef1817cebcc61b (patch)
treec1efda7cfd451659dfabe5c19c9347116fb96137 /media
parent990cff1bb03e37a466664bed842de631e5ca0e16 (diff)
downloadchromium_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 'media')
-rw-r--r--media/media.gyp6
1 files changed, 0 insertions, 6 deletions
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',