Chromium changes for static linking ffmpeg

media/base/media.h

 // 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.
 
 // Contains code that should be used for initializing, or querying the state
 // of the media library as a whole.
 
 #ifndef MEDIA_BASE_MEDIA_H_
 #define MEDIA_BASE_MEDIA_H_
 
 #include "media/base/media_export.h"
 
 namespace base {
 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.

[DaleCurtis, 2015/05/15 00:23:06]

Looks like you can delete all these methods within this patch set except the
void() one and the CPU specific one, no?

[chcunningham, 2015/05/16 04:36:25]

I haven't changed places like here yet.
https://code.google.com/p/chromium/codesearch#chromium/src/content/app/conten...

For a later cl if you agree.

+// 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.
 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
 // DLLs, DSOs, etc.  Only necessary if InitializeMediaLibrary() is not called;
 // does nothing if the media library has already been initialized.
 MEDIA_EXPORT void InitializeCPUSpecificMediaFeatures();
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_MEDIA_H_