Fixup chromium specific bits after merge.

ffmpeg.gyp

 # Copyright (c) 2011 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.
 
 # There's a couple key GYP variables that control how FFmpeg is built:
 #   ffmpeg_branding
 #     Controls whether we build the Chromium or Google Chrome version of
 #     FFmpeg.  The Google Chrome version contains additional codecs.
 #     Typical values are Chromium, Chrome, ChromiumOS, and ChromeOS.
 #   use_system_ffmpeg
@@ skipping 318 matching lines @@
               'extension': 'asm',
               'inputs': [ '<(yasm_path)', ],
               'outputs': [
                 '<(shared_generated_dir)/<(RULE_INPUT_ROOT).o',
               ],
               'action': [
                 '<(yasm_path)',
                 '-f', '<(obj_format)',
                 '<@(yasm_flags)',
                 '-I', 'libavcodec/x86/',
+                '-I', 'libavutil/x86/',
+                '-I', '.',
                 '-o', '<(shared_generated_dir)/<(RULE_INPUT_ROOT).o',
                 '<(RULE_INPUT_PATH)',
               ],
               'process_outputs_as_sources': 1,
               'message': 'Build ffmpeg yasm build <(RULE_INPUT_PATH).',
             },
           ],
         },
       ],
     }],
   ],  # conditions
   'targets': [
     {
       'variables': {
         'generate_stubs_script': '../../tools/generate_stubs/generate_stubs.py',
         'extra_header': 'chromium/ffmpeg_stub_headers.fragment',
         'sig_files': [
           # Note that these must be listed in dependency order.
           # (i.e. if A depends on B, then B must be listed before A.)
           'chromium/avutil-51.sigs',
-          'chromium/avcodec-53.sigs',
-          'chromium/avformat-53.sigs',
+          'chromium/avcodec-54.sigs',
+          'chromium/avformat-54.sigs',
         ],
       },
 
       'target_name': 'ffmpeg',
       'msvs_guid': 'D7A94F58-576A-45D9-A45F-EB87C63ABBB0',
       'sources': [
         # Hacks to introduce C99 types into Visual Studio.
         'chromium/include/win/inttypes.h',
         'chromium/include/win/stdint.h',
 
@@ skipping 32 matching lines @@
             '<(extra_header)',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               'chromium/include/win',
               'chromium/config',
               '.',
             ],
             'link_settings': {
               'libraries': [
-                '<(output_dir)/avcodec-53.lib',
-                '<(output_dir)/avformat-53.lib',
+                '<(output_dir)/avcodec-54.lib',
+                '<(output_dir)/avformat-54.lib',
                 '<(output_dir)/avutil-51.lib',
               ],
               'msvs_settings': {
                 'VCLinkerTool': {
                   'DelayLoadDLLs': [
-                    'avcodec-53.dll',
-                    'avformat-53.dll',
+                    'avcodec-54.dll',
+                    'avformat-54.dll',
                     'avutil-51.dll',
                   ],
                 },
               },
             },
           },
           'rules': [
             {
               'rule_name': 'generate_libs',
               'extension': 'sigs',
@@ skipping 12 matching lines @@
               ],
               'message': 'Generating FFmpeg import libraries.',
             },
           ],
 
           # Copy prebuilt binaries to build directory.
           'dependencies': ['../../build/win/system.gyp:cygwin'],
           'copies': [{
             'destination': '<(PRODUCT_DIR)/',
             'files': [
-              'chromium/binaries/<(ffmpeg_bin_dir)/avcodec-53.dll',
-              'chromium/binaries/<(ffmpeg_bin_dir)/avformat-53.dll',
+              'chromium/binaries/<(ffmpeg_bin_dir)/avcodec-54.dll',
+              'chromium/binaries/<(ffmpeg_bin_dir)/avformat-54.dll',
               'chromium/binaries/<(ffmpeg_bin_dir)/avutil-51.dll',
             ],
           }],
         }, {  # else OS != "win", use POSIX stub generator
           'variables': {
             'outfile_type': 'posix_stubs',
             'stubs_filename_root': 'ffmpeg_stubs',
             'project_path': 'third_party/ffmpeg',
             'intermediate_dir': '<(INTERMEDIATE_DIR)',
             'output_root': '<(SHARED_INTERMEDIATE_DIR)/ffmpeg',
@@ skipping 81 matching lines @@
                   ],
                 }],
               ],
             }],
           ],  # conditions
         }],
       ],  # conditions
     },
   ],  # targets
 }