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

Unified Diff: media/base/media_posix.cc

Issue 6628020: Cleaning up src/media to be consistent with static versus anonymous namespaces. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: fix namespaces Created 9 years, 10 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
Index: media/base/media_posix.cc
diff --git a/media/base/media_posix.cc b/media/base/media_posix.cc
index 438155a250abd0cc2154a5caa6b9fc87441e3591..08684e773e097fdc3d0f81ef173334d55cf410bf 100644
--- a/media/base/media_posix.cc
+++ b/media/base/media_posix.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -24,8 +24,6 @@ namespace tp_ffmpeg = third_party_ffmpeg;
namespace media {
-namespace {
-
// Handy to prevent shooting ourselves in the foot with macro wizardry.
#if !defined(LIBAVCODEC_VERSION_MAJOR) || \
!defined(LIBAVFORMAT_VERSION_MAJOR) || \
@@ -39,18 +37,20 @@ namespace {
#if defined(OS_MACOSX)
#define DSO_NAME(MODULE, VERSION) ("lib" MODULE "." VERSION ".dylib")
-const FilePath::CharType sumo_name[] =
+static const FilePath::CharType sumo_name[] =
FILE_PATH_LITERAL("libffmpegsumo.dylib");
#elif defined(OS_POSIX)
#define DSO_NAME(MODULE, VERSION) ("lib" MODULE ".so." VERSION)
-const FilePath::CharType sumo_name[] = FILE_PATH_LITERAL("libffmpegsumo.so");
+static const FilePath::CharType sumo_name[] =
+ FILE_PATH_LITERAL("libffmpegsumo.so");
#else
#error "Do not know how to construct DSO name for this OS."
#endif
-const FilePath::CharType openmax_name[] = FILE_PATH_LITERAL("libOmxCore.so");
+static const FilePath::CharType openmax_name[] =
+ FILE_PATH_LITERAL("libOmxCore.so");
// Retrieves the DSOName for the given key.
-std::string GetDSOName(tp_ffmpeg::StubModules stub_key) {
+static std::string GetDSOName(tp_ffmpeg::StubModules stub_key) {
// TODO(ajwong): Remove this once mac is migrated. Either that, or have GYP
// set a constant that we can switch implementations based off of.
switch (stub_key) {
@@ -66,8 +66,6 @@ std::string GetDSOName(tp_ffmpeg::StubModules stub_key) {
}
}
-} // namespace
-
// Attempts to initialize the media library (loading DSOs, etc.).
// Returns true if everything was successfully initialized, false otherwise.
bool InitializeMediaLibrary(const FilePath& module_dir) {

Powered by Google App Engine
This is Rietveld 408576698