summaryrefslogtreecommitdiffstats
path: root/third_party/ffmpeg
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-05 17:35:08 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-05 17:35:08 +0000
commitc9e45da0dec9692d8f59cef2e8c5cdac28baf51b (patch)
tree6aabce08a03122a49eaeb98bddd5daa6f63ccdb3 /third_party/ffmpeg
parent7c7d8abbb23cff0291d45738e8464eba0dddb1c1 (diff)
downloadchromium_src-c9e45da0dec9692d8f59cef2e8c5cdac28baf51b.zip
chromium_src-c9e45da0dec9692d8f59cef2e8c5cdac28baf51b.tar.gz
chromium_src-c9e45da0dec9692d8f59cef2e8c5cdac28baf51b.tar.bz2
Linux: preload ffmpeg in the zygote.
When using the sandbox, the renderer cannot load the ffmpeg shared objects from disk. So we load them in the zygote before the sandbox is started. (Note that this doesn't get media working, but it's a start.) BUG=18329 http://codereview.chromium.org/159841 (Note: relanding. Original landing in r22392, reverted in r22405 due to check-deps failure.) git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22492 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/ffmpeg')
-rwxr-xr-xthird_party/ffmpeg/ffmpeg.gyp4
1 files changed, 3 insertions, 1 deletions
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index f035165..458328f 100755
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -21,9 +21,11 @@
'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',
},