Chromium changes for static linking ffmpeg

media/base/media_stub.cc

Index: media/base/media_stub.cc
diff --git a/media/base/media_stub.cc b/media/base/media_stub.cc
deleted file mode 100644
index e3e02e40d60f9a9d2dacf5d012cb2889907dc2b7..0000000000000000000000000000000000000000
--- a/media/base/media_stub.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.

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

Don't you need this on android?

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

This is now done in media_init_stub.cc. Its essentially the same, but the
structure is a little different since we dont need the path, nor the bool
return. I changed the names a little. We used to have options paths (_posix,
_media, and _stubs), now just two (_init, and init_stubs)

-// 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 "base/files/file_path.h"
-
-// This file is intended for platforms that don't need to load any media
-// libraries (e.g., Android).
-namespace media {
-namespace internal {
-
-bool InitializeMediaLibraryInternal(const base::FilePath& module_dir) {
-  return true;
-}
-
-}  // namespace internal
-}  // namespace media