summaryrefslogtreecommitdiffstats
path: root/third_party/ffmpeg
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-02 18:08:52 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-02 18:08:52 +0000
commit89628fdf97043340df92389d82b480962a4e4ec3 (patch)
treee660e9ee200dcb92d28b0f3e8e07f4639ca9e17b /third_party/ffmpeg
parentb77c6c1ddc8b9904c2080d8259a33da3d5715d56 (diff)
downloadchromium_src-89628fdf97043340df92389d82b480962a4e4ec3.zip
chromium_src-89628fdf97043340df92389d82b480962a4e4ec3.tar.gz
chromium_src-89628fdf97043340df92389d82b480962a4e4ec3.tar.bz2
Make <video> works properly in test_shell in mac
BUG=23602 BUG=13907 1. FFmpeg binaries are copied to TestShell.app/Contents/MacOS 2. Load media_*.png for drawing the controls Review URL: http://codereview.chromium.org/248042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27863 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/ffmpeg')
-rwxr-xr-xthird_party/ffmpeg/ffmpeg.gyp4
1 files changed, 4 insertions, 0 deletions
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index b02c593..3a6135b 100755
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -224,6 +224,10 @@
}],
]},
], ['OS=="mac"', {
+ # TODO(ajwong): These files are also copied in:
+ # webkit/tools/test_shell/test_shell.gyp and
+ # chrome/chrome.gyp
+ # Need to consolidate the copies in one place. (BUG=23602)
'variables': {
'source_files': [
'binaries/<(ffmpeg_bin_dir)/libavcodec.52.dylib',