Chromium changes for static linking ffmpeg

media/base/media_win.cc

Index: media/base/media_win.cc
diff --git a/media/base/media_win.cc b/media/base/media_win.cc
deleted file mode 100644
index 03d78b1d454329bb0c8a8f648b3f0116ddcba75e..0000000000000000000000000000000000000000
--- a/media/base/media_win.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-// 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 "media/base/media.h"
-
-#include <windows.h>
-#if defined(_WIN32_WINNT_WIN8)
-// The Windows 8 SDK defines FACILITY_VISUALCPP in winerror.h.
-#undef FACILITY_VISUALCPP
-#endif
-#include <delayimp.h>
-
-#include "base/files/file_path.h"
-#include "base/metrics/sparse_histogram.h"
-#include "media/ffmpeg/ffmpeg_common.h"
-
-#pragma comment(lib, "delayimp.lib")
-
-namespace media {
-namespace internal {
-
-bool InitializeMediaLibraryInternal(const base::FilePath& module_dir) {
-  // LoadLibraryEx(..., LOAD_WITH_ALTERED_SEARCH_PATH) cannot handle
-  // relative path.
-  if (!module_dir.IsAbsolute())
-    return false;
-
-  // Use alternate DLL search path so we don't load dependencies from the
-  // system path.  Refer to http://crbug.com/35857
-  static const char kFFmpegDLL[] = "ffmpegsumo.dll";
-  HMODULE lib = ::LoadLibraryEx(
-      module_dir.AppendASCII(kFFmpegDLL).value().c_str(), NULL,
-      LOAD_WITH_ALTERED_SEARCH_PATH);
-
-  bool initialized = (lib != NULL);
-
-  // TODO(scherkus): Remove all the bool-ness from these functions as we no
-  // longer support disabling HTML5 media at runtime. http://crbug.com/440892
-  if (!initialized) {
-    UMA_HISTOGRAM_SPARSE_SLOWLY("Media.Initialize.Windows", GetLastError());

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

Need to mark this histogram as deprecated now.

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

Done.

-    return false;
-  }
-
-  // VS2013 has a bug where FMA3 instructions will be executed on CPUs that
-  // support them despite them being disabled at the OS level, causing illegal
-  // instruction exceptions. Because Web Audio's FFT code *might* run before
-  // HTML5 media code, call av_log_set_level() to force library initialziation.
-  // See http://crbug.com/440892 for details.
-  av_log_set_level(AV_LOG_QUIET);
-
-  return initialized;
-}
-
-}  // namespace internal
-}  // namespace media