Remove libvpx from FFmpeg in favour of ffvp8.

ffmpeg/source/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 69 matching lines @@
           'target_name': 'ffmpegsumo',
           'type': 'loadable_module',
           'sources': [
             'config/<(ffmpeg_branding)/<(os_config)/<(ffmpeg_config)/config.h',
             'config/libavutil/avconfig.h',
           ],
           'include_dirs': [
             'config/<(ffmpeg_branding)/<(os_config)/<(ffmpeg_config)',
             'patched-ffmpeg',
             'config',
-            # TODO(fischman): when both mac & linux are building from
-            # libvpx source replace this hackery with a simple target
-            # dependency on libvpx and let that export its headers.
-            '../libvpx/include',
           ],
           'defines': [
             'HAVE_AV_CONFIG_H',
             '_POSIX_C_SOURCE=200112',
             '_XOPEN_SOURCE=600',
           ],
           'cflags': [
             '-fomit-frame-pointer',
           ],
           'includes': [
@@ skipping 76 matching lines @@
                 # Don't warn about libavformat using its own deprecated APIs.
                 '-Wno-deprecated-declarations',
               ],
               'cflags!': [
                 # Ensure the symbols are exported.
                 #
                 # TODO(ajwong): Manually tag the API that we use to be
                 # exported.
                 '-fvisibility=hidden',
               ],
-              'dependencies': [
-                '../libvpx/libvpx.gyp:libvpx',
-              ],
               'link_settings': {
                 'ldflags': [
                   '-Wl,-Bsymbolic',
                   '-L<(shared_generated_dir)',
                 ],
                 'libraries': [
                   '-lz',
                 ],
               },
               'variables': {
@@ skipping 27 matching lines @@
             }],  # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"
             ['OS=="mac"', {
               'conditions': [
                 ['mac_breakpad==1', {
                   'variables': {
                     # A real .dSYM is needed for dump_syms to operate on.
                     'mac_real_dsym': 1,
                   },
                 }],
               ],
-              'dependencies': [
-                '../libvpx/libvpx.gyp:libvpx',
-              ],
               'link_settings': {
                 'libraries': [
                   '$(SDKROOT)/usr/lib/libz.dylib',
                 ],
               },
               'xcode_settings': {
                 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',  # No -fvisibility=hidden
                 'GCC_DYNAMIC_NO_PIC': 'YES',         # -mdynamic-no-pic
                                                      # (equiv -fno-PIC)
                 'DYLIB_INSTALL_NAME_BASE': '@loader_path',
@@ skipping 66 matching lines @@
               'process_outputs_as_sources': 1,
               'message': 'Build ffmpeg yasm build <(RULE_INPUT_PATH).',
             },
           ],
         },
       ],
     }],
   ],  # conditions
   'targets': [
     {
-      # Determine whether we should export libvpx symbols.
       'variables': {
         'generate_stubs_script': '../../tools/generate_stubs/generate_stubs.py',
         'extra_header': 'ffmpeg_stub_headers.fragment',
-        'conditions': [
-          ['use_system_ffmpeg==1', {
-            '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.)
-              # See: http://code.google.com/p/chromium/issues/detail?id=70687
-              'avutil-51.sigs',
-              'avcodec-53.novpx_sigs',
-              'avformat-53.sigs',
-            ],
-          }, {  # otherwise we export libvpx symbols.
-            '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.)
-              'avutil-51.sigs',
-              'avcodec-53.sigs',
-              'avformat-53.sigs',
-            ],
-          }],
+        '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.)
+          'avutil-51.sigs',
+          'avcodec-53.sigs',
+          'avformat-53.sigs',
         ],
       },
 
       'target_name': 'ffmpeg',
       'msvs_guid': 'D7A94F58-576A-45D9-A45F-EB87C63ABBB0',
       'sources': [
         # Hacks to introduce C99 types into Visual Studio.
         'include/win/inttypes.h',
         'include/win/stdint.h',
 
         # Files needed for stub generation rules.
         '<@(sig_files)',
         '<(extra_header)'
       ],
       'defines': [
         '__STDC_CONSTANT_MACROS',  # FFmpeg uses INT64_C.
       ],
-      'include_dirs': [
-        # TODO(fischman): when both mac & linux are building from
-        # libvpx source replace this hackery with a simple target
-        # dependency on libvpx and let that export its headers.
-        '../libvpx/include',
-      ],
       'hard_dependency': 1,
 
       # Do not fear the massive conditional blocks!  They do the following:
       #   1) Use the Window stub generator on Windows
       #   2) Else, use the POSIX stub generator on non-Windows
       #     a) Use system includes when use_system_ffmpeg!=0
       #     b) Else, use our local copy in patched-ffmpeg
       'conditions': [
         ['OS=="win"', {
           'variables': {
@@ skipping 180 matching lines @@
       ],  # conditions
     },
   ],  # targets
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: