Move the ffmpeg loading function into media library.

This will allow us to hide the platform specific library loading code from the main chrome code.

Review URL: http://codereview.chromium.org/69027

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13991 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 23 deletions

diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index b8d7867..f5f6bf9 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -31,17 +31,6 @@ bool GetGearsPluginPathFromCommandLine(FilePath* path) {
 #endif
 }
 
-// Attempts to find the given FFmpeg library and stores the result in |path|.
-// Returns true if the library was found and exists, false otherwise.
-static bool GetFFmpegLibraryPath(FilePath* path,
-                                 const FilePath::StringType& library) {
-  // Assume FFmpeg DLLs are kept alongside chrome.dll.
-  if (!PathService::Get(base::DIR_MODULE, path))
-    return false;
-  *path = path->Append(library);
-  return file_util::PathExists(*path);
-}
-
 bool PathProvider(int key, FilePath* result) {
   // Some keys are just aliases...
   switch (key) {
@@ -161,18 +150,6 @@ bool PathProvider(int key, FilePath* result) {
 #endif
       }
       break;
-    case chrome::FILE_LIBAVCODEC:
-      if (!GetFFmpegLibraryPath(&cur, FILE_PATH_LITERAL("avcodec-52.dll")))
-        return false;
-      break;
-    case chrome::FILE_LIBAVFORMAT:
-      if (!GetFFmpegLibraryPath(&cur, FILE_PATH_LITERAL("avformat-52.dll")))
-        return false;
-      break;
-    case chrome::FILE_LIBAVUTIL:
-      if (!GetFFmpegLibraryPath(&cur, FILE_PATH_LITERAL("avutil-50.dll")))
-        return false;
-      break;
     // The following are only valid in the development environment, and
     // will fail if executed from an installed executable (because the
     // generated path won't exist).