diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-04 21:14:19 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-04 21:14:19 +0000 |
| commit | 13e2edee5394104e38ea6713b57eb8e79e030e1c (patch) | |
| tree | 10dcd648aeda506cdd7d4f563fcf49e8f7fc98be | |
| parent | e2c2b560f36abd25ef9655858e5db238051687c4 (diff) | |
| download | chromium_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
| -rw-r--r-- | chrome/browser/zygote_main_linux.cc | 7 | ||||
| -rwxr-xr-x | third_party/ffmpeg/ffmpeg.gyp | 4 |
2 files changed, 1 insertions, 10 deletions
diff --git a/chrome/browser/zygote_main_linux.cc b/chrome/browser/zygote_main_linux.cc index 6752a06..2df1029 100644 --- a/chrome/browser/zygote_main_linux.cc +++ b/chrome/browser/zygote_main_linux.cc @@ -14,7 +14,6 @@ #include "base/command_line.h" #include "base/eintr_wrapper.h" #include "base/global_descriptors_posix.h" -#include "base/path_service.h" #include "base/pickle.h" #include "base/rand_util.h" #include "base/sys_info.h" @@ -27,8 +26,6 @@ #include "chrome/common/process_watcher.h" #include "chrome/common/sandbox_methods_linux.h" -#include "media/base/media.h" - #include "skia/ext/SkFontHost_fontconfig_control.h" // http://code.google.com/p/chromium/wiki/LinuxZygote @@ -329,10 +326,6 @@ static bool MaybeEnterChroot() { PATCH_GLOBAL_OFFSET_TABLE(localtime_r, sandbox_wrapper::localtime_r); #endif - FilePath module_path; - if (PathService::Get(base::DIR_MODULE, &module_path)) - media::InitializeMediaLibrary(module_path); - static const char kChrootMe = 'C'; static const char kChrootMeSuccess = 'O'; 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', }, |