Chromium changes for static linking ffmpeg

content/app/content_main_runner.cc

Index: content/app/content_main_runner.cc
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index 279536b09b983deec9ae5f22856e5c0bbb72f83a..274950068b7776aba58899ac30a32a0572e122ea 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -280,12 +280,7 @@ int RunZygote(const MainFunctionParams& main_function_params,
   ScopedVector<ZygoteForkDelegate> zygote_fork_delegates;
   if (delegate) {
     delegate->ZygoteStarting(&zygote_fork_delegates);
-    // Each Renderer we spawn will re-attempt initialization of the media
-    // libraries, at which point failure will be detected and handled, so
-    // we do not need to cope with initialization failures here.
-    base::FilePath media_path;
-    if (PathService::Get(DIR_MEDIA_LIBS, &media_path))

[DaleCurtis, 2015/05/18 23:33:14]

You can remove the DIR_MEDIA_LIBS PathService entries now too from
content/common/content_paths.{h,cc}

[chcunningham, 2015/05/21 22:10:27]

This seems to still be used here:
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/utility/med...

-      media::InitializeMediaLibrary(media_path);
+    media::InitializeMediaLibrary();
   }
 
   // This function call can return multiple times, once per fork().