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 /chrome/chrome_dll.gypi | |
| 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 'chrome/chrome_dll.gypi')
| -rw-r--r-- | chrome/chrome_dll.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 2e94d59..6ad675d 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -502,7 +502,7 @@ 'files': [ # TODO(ajwong): Find a way to share this path with # ffmpeg.gyp so they don't diverge. (BUG=23602) - '<(PRODUCT_DIR)/libffmpegsumo.dylib', + '<(PRODUCT_DIR)/ffmpegsumo.so', ], }, { |