Update ffmpeg binaries directories to support variants based off the target architecture.

chrome/chrome.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.
 
 {
   'variables': {
     'chromium_code': 1,
 
     # Define the common dependencies that contain all the actual
     # Chromium functionality.  This list gets pulled in below by
@@ skipping 3221 matching lines @@
           # (e.g. "Chromium", "Chrome")
           'conditions': [
             ['branding=="Chrome"', {
               'mac_bundle_resources': [
                 'app/theme/google_chrome/app.icns',
                 'app/theme/google_chrome/document.icns',
               ],
               'copies': [
                 {
                   'destination': '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/MacOS',
+                  # TODO(ajwong): This, and the parallel chromium stanza below
+                  # really should find a way to share file paths with
+                  # ffmpeg.gyp so they don't diverge.
                   'files': [
-                    '../third_party/ffmpeg/binaries/chrome/libavcodec.52.dylib',
-                    '../third_party/ffmpeg/binaries/chrome/libavformat.52.dylib',
-                    '../third_party/ffmpeg/binaries/chrome/libavutil.50.dylib',
+                    '../third_party/ffmpeg/binaries/chrome/mac/ia32/libavcodec.52.dylib',
+                    '../third_party/ffmpeg/binaries/chrome/mac/ia32/libavformat.52.dylib',
+                    '../third_party/ffmpeg/binaries/chrome/mac/ia32/libavutil.50.dylib',
                   ],
                 },
               ],
             }, {  # else: 'branding!="Chrome"
               'mac_bundle_resources': [
                 'app/theme/chromium/app.icns',
                 'app/theme/chromium/document.icns',
               ],
               'copies': [
                 {
                   'destination': '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/MacOS',
                   'files': [
-                    '../third_party/ffmpeg/binaries/chromium/libavcodec.52.dylib',
-                    '../third_party/ffmpeg/binaries/chromium/libavformat.52.dylib',
-                    '../third_party/ffmpeg/binaries/chromium/libavutil.50.dylib',
+                    '../third_party/ffmpeg/binaries/chromium/mac/ia32/libavcodec.52.dylib',
+                    '../third_party/ffmpeg/binaries/chromium/mac/ia32/libavformat.52.dylib',
+                    '../third_party/ffmpeg/binaries/chromium/mac/ia32/libavutil.50.dylib',
                   ],
                 },
               ],
             }],
             ['mac_breakpad==1', {
               'variables': {
                 # A real .dSYM is needed for dump_syms to operate on.
                 'mac_real_dsym': 1,
               },
               'dependencies': [
@@ skipping 3318 matching lines @@
               'dependencies': [
                 '../third_party/pthreads-win32/pthreads.gyp:pthreads',
               ],
             }],
           ],
         },
       ],  # targets when chrome_personalization==1 and use_syncapi_stub==0
     }],
   ],  # 'conditions'
 }