Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1004)

Unified Diff: media/base/media_posix.cc

Issue 14659007: Remove use_system_ffmpeg-related logic from media and other mainline gyp files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more removals Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/linux/unbundle/ffmpeg.gyp ('k') | media/ffmpeg/ffmpeg_common.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/media_posix.cc
diff --git a/media/base/media_posix.cc b/media/base/media_posix.cc
index 243495a4a1e9f5803528d6198a36a00a7c48ccea..4aabae9106e913d2f9f46f1868aa0adcbb2bbc87 100644
--- a/media/base/media_posix.cc
+++ b/media/base/media_posix.cc
@@ -11,15 +11,12 @@
#include "base/path_service.h"
#include "base/strings/stringize_macros.h"
#include "media/ffmpeg/ffmpeg_common.h"
-
-#if !defined(USE_SYSTEM_FFMPEG)
#include "third_party/ffmpeg/ffmpeg_stubs.h"
using third_party_ffmpeg::kNumStubModules;
using third_party_ffmpeg::kModuleFfmpegsumo;
using third_party_ffmpeg::InitializeStubs;
using third_party_ffmpeg::StubPathMap;
-#endif // !defined(USE_SYSTEM_FFMPEG)
namespace media {
namespace internal {
@@ -49,11 +46,6 @@ static const base::FilePath::CharType kSumoLib[] =
#endif
bool InitializeMediaLibraryInternal(const base::FilePath& module_dir) {
-#if defined(USE_SYSTEM_FFMPEG)
- // No initialization is necessary when using system ffmpeg,
- // we just link directly with system ffmpeg libraries.
- return true;
-#else
StubPathMap paths;
// First try to initialize with Chrome's sumo library.
@@ -69,7 +61,6 @@ bool InitializeMediaLibraryInternal(const base::FilePath& module_dir) {
FILE_PATH_LITERAL(DSO_NAME("avformat", AVFORMAT_VERSION))).value());
return InitializeStubs(paths);
-#endif // !defined(USE_SYSTEM_FFMPEG)
}
} // namespace internal
« no previous file with comments | « build/linux/unbundle/ffmpeg.gyp ('k') | media/ffmpeg/ffmpeg_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698