Revert "Chromium changes to statically link ffmpeg."

content/app/content_main_runner.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/app/content_main_runner.h"
 
 #include <stdlib.h>
 
 #include "base/allocator/allocator_extension.h"
 #include "base/at_exit.h"
@@ skipping 264 matching lines @@
     { switches::kRendererProcess,    RendererMain },
 #if defined(ENABLE_PLUGINS)
     { switches::kPpapiPluginProcess, PpapiPluginMain },
 #endif
     { switches::kUtilityProcess,     UtilityMain },
   };
 
   ScopedVector<ZygoteForkDelegate> zygote_fork_delegates;
   if (delegate) {
     delegate->ZygoteStarting(&zygote_fork_delegates);
-    media::InitializeMediaLibrary();
+    // 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))
+      media::InitializeMediaLibrary(media_path);
   }
 
   // This function call can return multiple times, once per fork().
   if (!ZygoteMain(main_function_params, zygote_fork_delegates.Pass()))
     return 1;
 
   if (delegate) delegate->ZygoteForked();
 
   // Zygote::HandleForkRequest may have reallocated the command
   // line so update it here with the new version.
@@ skipping 559 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
 };
 
 // static
 ContentMainRunner* ContentMainRunner::Create() {
   return new ContentMainRunnerImpl();
 }
 
 }  // namespace content