summaryrefslogtreecommitdiffstats
path: root/third_party/ffmpeg
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-04 21:14:19 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-04 21:14:19 +0000
commit13e2edee5394104e38ea6713b57eb8e79e030e1c (patch)
tree10dcd648aeda506cdd7d4f563fcf49e8f7fc98be /third_party/ffmpeg
parente2c2b560f36abd25ef9655858e5db238051687c4 (diff)
downloadchromium_src-13e2edee5394104e38ea6713b57eb8e79e030e1c.zip
chromium_src-13e2edee5394104e38ea6713b57eb8e79e030e1c.tar.gz
chromium_src-13e2edee5394104e38ea6713b57eb8e79e030e1c.tar.bz2
Revert "Linux: preload ffmpeg in the zygote."
This reverts commit r22392. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22405 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/ffmpeg')
-rwxr-xr-xthird_party/ffmpeg/ffmpeg.gyp4
1 files changed, 1 insertions, 3 deletions
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index 458328f..f035165 100755
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -21,11 +21,9 @@
'variables': {
'generate_stubs_script': 'generate_stubs.py',
'sig_files': [
- # Note that these must be listed in dependency order.
- # (i.e. if A depends on B, then B must be listed before A.)
- 'avutil-50.sigs',
'avcodec-52.sigs',
'avformat-52.sigs',
+ 'avutil-50.sigs',
],
'extra_header': 'ffmpeg_stub_headers.fragment',
},