Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2044)

Unified Diff: chrome/browser/zygote_main_linux.cc

Issue 159841: Linux: preload ffmpeg in the zygote. (Closed)
Patch Set: Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/ffmpeg/ffmpeg.gyp » ('j') | third_party/ffmpeg/ffmpeg.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/zygote_main_linux.cc
diff --git a/chrome/browser/zygote_main_linux.cc b/chrome/browser/zygote_main_linux.cc
index a163550287bea0cb17c23fc243fb93d51987749d..01eb8379e5d85e8fde5a7edbcc2a163b2a54784e 100644
--- a/chrome/browser/zygote_main_linux.cc
+++ b/chrome/browser/zygote_main_linux.cc
@@ -14,6 +14,7 @@
#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/unix_domain_socket_posix.h"
@@ -25,6 +26,8 @@
#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
@@ -323,6 +326,10 @@ 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';
« no previous file with comments | « no previous file | third_party/ffmpeg/ffmpeg.gyp » ('j') | third_party/ffmpeg/ffmpeg.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698