Fixup chromium specific bits after merge.

ffmpeg.gyp

Index: ffmpeg.gyp
diff --git a/ffmpeg.gyp b/ffmpeg.gyp
index 25f491c2ad4e51510fa7d59033c2abcd9dcd2cf6..5a45dd6a0855296999387d951bfac1b15e9aefdc 100644
--- a/ffmpeg.gyp
+++ b/ffmpeg.gyp
@@ -336,6 +336,8 @@
                 '-f', '<(obj_format)',
                 '<@(yasm_flags)',
                 '-I', 'libavcodec/x86/',
+                '-I', 'libavutil/x86/',
+                '-I', '.',
                 '-o', '<(shared_generated_dir)/<(RULE_INPUT_ROOT).o',
                 '<(RULE_INPUT_PATH)',
               ],
@@ -356,8 +358,8 @@
           # 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',
         ],
       },
 
@@ -410,15 +412,15 @@
             ],
             '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',
                   ],
                 },
@@ -451,8 +453,8 @@
           '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',
             ],
           }],