diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 02:15:12 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 02:15:12 +0000 |
| commit | 176ab8038d7c1b291dcec51f29ed81f9fba52b8e (patch) | |
| tree | cf837db3622bc957a21309e96005e16a94cf594d /media | |
| parent | ab9cb282693fb8e36b2d035fccd07d4b93acf65f (diff) | |
| download | chromium_src-176ab8038d7c1b291dcec51f29ed81f9fba52b8e.zip chromium_src-176ab8038d7c1b291dcec51f29ed81f9fba52b8e.tar.gz chromium_src-176ab8038d7c1b291dcec51f29ed81f9fba52b8e.tar.bz2 | |
Add shared macros for stringizing and converting ANSI string constants
(in particular defined by macros) to wide string constants.
Convert existing locally-defined stringizing to use the shared macros.
Unit tests for the shared macros.
This also fixes a minor bug in ceee_module_util.cc where I
accidentally quoted a string constant I only meant to convert to wide
(this caused no bug, but was unintended, so the change in semantics
in that file in the current change is intentional).
BUG=none
TEST=automated tests
Review URL: http://codereview.chromium.org/5103001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66579 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/media_posix.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/media/base/media_posix.cc b/media/base/media_posix.cc index 89f8a17..272e9e6 100644 --- a/media/base/media_posix.cc +++ b/media/base/media_posix.cc @@ -12,6 +12,7 @@ #include "base/logging.h" #include "base/native_library.h" #include "base/path_service.h" +#include "base/stringize_macros.h" #include "media/ffmpeg/ffmpeg_common.h" #include "third_party/ffmpeg/ffmpeg_stubs.h" #if defined(OS_LINUX) @@ -32,12 +33,9 @@ namespace { #error FFmpeg headers not included! #endif -#define STRINGIZE(x) #x -#define STRINGIZE_MACRO(x) STRINGIZE(x) - -#define AVCODEC_VERSION STRINGIZE_MACRO(LIBAVCODEC_VERSION_MAJOR) -#define AVFORMAT_VERSION STRINGIZE_MACRO(LIBAVFORMAT_VERSION_MAJOR) -#define AVUTIL_VERSION STRINGIZE_MACRO(LIBAVUTIL_VERSION_MAJOR) +#define AVCODEC_VERSION STRINGIZE(LIBAVCODEC_VERSION_MAJOR) +#define AVFORMAT_VERSION STRINGIZE(LIBAVFORMAT_VERSION_MAJOR) +#define AVUTIL_VERSION STRINGIZE(LIBAVUTIL_VERSION_MAJOR) #if defined(OS_MACOSX) #define DSO_NAME(MODULE, VERSION) ("lib" MODULE "." VERSION ".dylib") |