Checking in Windows FFmpeg binaries for Chromium.

BUG=15906
TEST=builds of Chromium should now be video/audio enabled

Review URL: http://codereview.chromium.org/149165

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19987 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 34 insertions, 10 deletions

diff --git a/third_party/ffmpeg/binaries/chromium/README.chromium b/third_party/ffmpeg/binaries/chromium/README.chromium
new file mode 100755
index 0000000..c7dba7c
--- /dev/null
+++ b/third_party/ffmpeg/binaries/chromium/README.chromium
@@ -0,0 +1,12 @@
+Contains FFmpeg binaries suitable for Chromium.  Essentially a build of FFmpeg
+that only contains the following features:
+  Video codecs
+    - Theora
+  Audio codecs
+    - Vorbis
+  Container formats
+    - Ogg
+
+These were built using the instructions posted at:
+  http://src.chromium.org/viewvc/chrome/trunk/deps/third_party/ffmpeg/
+  http://src.chromium.org/viewvc/chrome/trunk/deps/third_party/mingw/
diff --git a/third_party/ffmpeg/binaries/chromium/avcodec-52.dll b/third_party/ffmpeg/binaries/chromium/avcodec-52.dll
new file mode 100755
index 0000000..ad0473c
--- /dev/null
+++ b/third_party/ffmpeg/binaries/chromium/avcodec-52.dll
diff --git a/third_party/ffmpeg/binaries/chromium/avformat-52.dll b/third_party/ffmpeg/binaries/chromium/avformat-52.dll
new file mode 100755
index 0000000..dc0685b
--- /dev/null
+++ b/third_party/ffmpeg/binaries/chromium/avformat-52.dll
diff --git a/third_party/ffmpeg/binaries/chromium/avutil-50.dll b/third_party/ffmpeg/binaries/chromium/avutil-50.dll
new file mode 100755
index 0000000..f0aba24
--- /dev/null
+++ b/third_party/ffmpeg/binaries/chromium/avutil-50.dll
diff --git a/third_party/ffmpeg/binaries/chromium/pthreadGC2.dll b/third_party/ffmpeg/binaries/chromium/pthreadGC2.dll
new file mode 100755
index 0000000..8b9116c
--- /dev/null
+++ b/third_party/ffmpeg/binaries/chromium/pthreadGC2.dll
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index 0d50a5d..c6ad1a8 100755
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -170,6 +170,8 @@
       ],
     },
     {
+      # We prefer the Chrome binaries over the Chromium ones, which will get
+      # overwritten due to the order that the binaries are copied.
       'target_name': 'ffmpeg_binaries',
       'type': 'none',
       'msvs_guid': '4E4070E1-EFD9-4EF1-8634-3960956F6F10',
@@ -177,10 +179,14 @@
         ['OS=="win"', {
           'variables': {
             'source_files': [
-              'binaries/avcodec-52.dll',
-              'binaries/avformat-52.dll',
-              'binaries/avutil-50.dll',
-              'binaries/pthreadGC2.dll',
+              'binaries/chromium/avcodec-52.dll',
+              'binaries/chromium/avformat-52.dll',
+              'binaries/chromium/avutil-50.dll',
+              'binaries/chromium/pthreadGC2.dll',
+              'binaries/chrome/avcodec-52.dll',
+              'binaries/chrome/avformat-52.dll',
+              'binaries/chrome/avutil-50.dll',
+              'binaries/chrome/pthreadGC2.dll',
             ],
             'output_files': [
               '<(PRODUCT_DIR)/avcodec-52.dll',
@@ -193,9 +199,12 @@
         }], ['OS=="linux"', {
           'variables': {
             'source_files': [
-              'binaries/libavcodec.so.52',
-              'binaries/libavformat.so.52',
-              'binaries/libavutil.so.50',
+              'binaries/chromium/libavcodec.so.52',
+              'binaries/chromium/libavformat.so.52',
+              'binaries/chromium/libavutil.so.50',
+              'binaries/chrome/libavcodec.so.52',
+              'binaries/chrome/libavformat.so.52',
+              'binaries/chrome/libavutil.so.50',
             ],
             'output_files': [
               '<(PRODUCT_DIR)/libavcodec.so.52',
@@ -206,9 +215,12 @@
         }], ['OS=="mac"', {
           'variables': {
             'source_files': [
-              'binaries/libavcodec.52.dylib',
-              'binaries/libavformat.52.dylib',
-              'binaries/libavutil.50.dylib',
+              'binaries/chromium/libavcodec.52.dylib',
+              'binaries/chromium/libavformat.52.dylib',
+              'binaries/chromium/libavutil.50.dylib',
+              'binaries/chrome/libavcodec.52.dylib',
+              'binaries/chrome/libavformat.52.dylib',
+              'binaries/chrome/libavutil.50.dylib',
             ],
             'output_files': [
               '<(PRODUCT_DIR)/libavcodec.52.dylib',