Checking in Windows FFmpeg binaries for Chromium.

third_party/ffmpeg/ffmpeg.gyp

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'includes': [
     '../../build/common.gypi',
   ],
   'target_defaults': {
     'conditions': [
@@ skipping 152 matching lines @@
                 ],
                 'message': 'Generating FFmpeg stubs for dynamic loading.',
                 'process_outputs_as_sources': 1,
               },
             ],
           }
         ],
       ],
     },
     {
+      # We prefer the Chrome binaries over the Chromium ones, which will get
+      # overwritten due to the order that the binaries are copied.

[awong, 2009/07/03 01:52:05]

So we decided not to use the branding varaible to select between the
directories?

Relying on argument order is a little scary.

       'target_name': 'ffmpeg_binaries',
       'type': 'none',
       'msvs_guid': '4E4070E1-EFD9-4EF1-8634-3960956F6F10',
       'conditions': [
         ['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',
               '<(PRODUCT_DIR)/avformat-52.dll',
               '<(PRODUCT_DIR)/avutil-50.dll',
               '<(PRODUCT_DIR)/pthreadGC2.dll',
             ],
           },
           'dependencies': ['../../build/win/system.gyp:cygwin'],
         }], ['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',
               '<(PRODUCT_DIR)/libavformat.so.52',
               '<(PRODUCT_DIR)/libavutil.so.50',
             ],
           },
         }], ['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',
               '<(PRODUCT_DIR)/libavformat.52.dylib',
               '<(PRODUCT_DIR)/libavutil.50.dylib',
             ],
           },
         }],
       ],
       'sources': [
@@ skipping 11 matching lines @@
             './copy_binaries.sh',
             '<@(source_files)',
             '<(PRODUCT_DIR)/'
           ],
           'message': 'Copying FFmpeg binaries...',
         },
       ],
     },
   ],
 }