Chromium changes for static linking ffmpeg

media/base/media.h

Index: media/base/media.h
diff --git a/media/base/media.h b/media/base/media.h
index c86e5683faccc87e5e3f133530efe35f9538e4db..019bf9f681c3eaf7bf48169234e67e7b36c6af59 100644
--- a/media/base/media.h
+++ b/media/base/media.h
@@ -16,19 +16,17 @@ class FilePath;
 
 namespace media {
 
-// Attempts to initialize the media library (loading DLLs, DSOs, etc.).
-//
-// If |module_dir| is the empty string, then the system default library paths
-// are searched for the dynamic libraries.  If a |module_dir| is provided, then
-// only the specified |module_dir| will be searched for the dynamic libraries.
-//
-// If multiple initializations are attempted with different |module_dir|s
-// specified then the first one to succeed remains effective for the lifetime
-// of the process.
-//
-// Returns true if everything was successfully initialized, false otherwise.
+// Initializes media libraries (e.g. ffmpeg) as well as CPU specific media
+// features.
+// TODO(chcunningham): Remove this method in favor of the zero-argument version.
+// Because ffmpeg is now statically linked, path is no longer needed and return
+// will always be true.
 MEDIA_EXPORT bool InitializeMediaLibrary(const base::FilePath& module_dir);
 
+// Initializes media libraries (e.g. ffmpeg) as well as CPU specific media
+// features.
+MEDIA_EXPORT void InitializeMediaLibrary();
+
 // Helper function for unit tests to avoid boiler plate code everywhere. This
 // function will crash if it fails to load the media library. This ensures tests
 // fail if the media library is not available.
@@ -36,6 +34,8 @@ MEDIA_EXPORT void InitializeMediaLibraryForTesting();
 
 // Use this if you need to check whether the media library is initialized
 // for the this process, without actually trying to initialize it.
+// TODO(chcunningham): Delete this method. Users should just call Initialize
+// blindly and let it bail if its already been done.
 MEDIA_EXPORT bool IsMediaLibraryInitialized();
 
 // Use this if you need to initialize CPU specific features WITHOUT loading