diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-27 23:43:52 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-27 23:43:52 +0000 |
| commit | 880466d4a9f8a06766552b294cf66e44d30a041d (patch) | |
| tree | 6afefe297cb42c8d0bdac84db38e35c5f422583f /media/base/media_posix.cc | |
| parent | 246b3cfa2549123776269ada8fe21e1535c6b748 (diff) | |
| download | chromium_src-880466d4a9f8a06766552b294cf66e44d30a041d.zip chromium_src-880466d4a9f8a06766552b294cf66e44d30a041d.tar.gz chromium_src-880466d4a9f8a06766552b294cf66e44d30a041d.tar.bz2 | |
ffmpeg: r94155 -> r94207
Includes:
r94192 Clarify ffmpeg.gyp comments.
r94207 Build ffmpegsumo as a loadable_module, not a shared_library
The latter change causes us to use a new name for ffmpegsumo on Mac.
BUG=74216
Review URL: http://codereview.chromium.org/7470035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94390 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/media_posix.cc')
| -rw-r--r-- | media/base/media_posix.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/base/media_posix.cc b/media/base/media_posix.cc index 2c05376..adad88b 100644 --- a/media/base/media_posix.cc +++ b/media/base/media_posix.cc @@ -36,9 +36,10 @@ namespace media { #define AVUTIL_VERSION STRINGIZE(LIBAVUTIL_VERSION_MAJOR) #if defined(OS_MACOSX) +// TODO(evan): should be using .so like ffmepgsumo here. #define DSO_NAME(MODULE, VERSION) ("lib" MODULE "." VERSION ".dylib") static const FilePath::CharType sumo_name[] = - FILE_PATH_LITERAL("libffmpegsumo.dylib"); + FILE_PATH_LITERAL("ffmpegsumo.so"); #elif defined(OS_POSIX) #define DSO_NAME(MODULE, VERSION) ("lib" MODULE ".so." VERSION) static const FilePath::CharType sumo_name[] = |