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

build/common.gypi

 # 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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   'variables': {
     # .gyp files should set chromium_code to 1 if they build Chromium-specific
@@ skipping 17 matching lines @@
       # Override buildtype to select the desired build flavor.
       # Dev - everyday build for development/testing
       # Official - release build (generally implies additional processing)
       # TODO(mmoss) Once 'buildtype' is fully supported (e.g. Windows gyp
       # conversion is done), some of the things which are now controlled by
       # 'branding', such as symbol generation, will need to be refactored based
       # on 'buildtype' (i.e. we don't care about saving symbols for non-Official
       # builds).
       'buildtype%': 'Dev',
 
+      # The architecture that we're building on.
+      'target_arch%': 'ia32',
+
       # We do want to build Chromium with Breakpad support in certain
       # situations. I.e. for Chrome bot.
       'linux_chromium_breakpad%': 0,
     },
 
     # Define branding and buildtype on the basis of their settings within the
     # variables sub-dict above, unless overridden.
     'branding%': '<(branding)',
     'buildtype%': '<(buildtype)',
+    'target_arch%': '<(target_arch)',
 
     # Override chromium_mac_pch and set it to 0 to suppress the use of
     # precompiled headers on the Mac.  Prefix header injection may still be
     # used, but prefix headers will not be precompiled.  This is useful when
     # using distcc to distribute a build to compile slaves that don't
     # share the same compiler executable as the system driving the compilation,
     # because precompiled headers rely on pointers into a specific compiler
     # executable's image.  Setting this to 0 is needed to use an experimental
     # Linux-Mac cross compiler distcc farm.
     'chromium_mac_pch%': 1,
@@ skipping 50 matching lines @@
     # Yes(1) means set use the common linker options.
     'msvs_use_common_linker_extras%': 1,
 
     # TODO(sgk): eliminate this if possible.
     # It would be nicer to support this via a setting in 'target_defaults'
     # in chrome/app/locales/locales.gypi overriding the setting in the
     # 'Debug' configuration in the 'target_defaults' dict below,
     # but that doesn't work as we'd like.
     'msvs_debug_link_incremental%': '2',
 
-    # The architecture that we're building on.
-    'target_arch%': 'ia32',
-
     # By default linux does not use views. To turn on views in Linux
     # set the variable GYP_DEFINES to "toolkit_views=1", or modify
     # ~/.gyp/include.gypi .
     'toolkit_views%': 0,
 
     'chromeos%': 0,
 
     # The system root for cross-compiles. Default: none.
     'sysroot%': '',
 
@@ skipping 703 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }