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 17:48:22 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-04 17:48:22 +0000
commit96921d17f7932adaa6cc5afc37b3d13c46715ae5 (patch)
tree17b410095fe9950cfb71fb2361c995e9a726ba6e /third_party/ffmpeg
parentbf8d01693570f078078c006b7fdb834e25388b97 (diff)
downloadchromium_src-96921d17f7932adaa6cc5afc37b3d13c46715ae5.zip
chromium_src-96921d17f7932adaa6cc5afc37b3d13c46715ae5.tar.gz
chromium_src-96921d17f7932adaa6cc5afc37b3d13c46715ae5.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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22392 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',
},