Revert "Chromium changes to statically link ffmpeg."

media/media.gyp

 # Copyright (c) 2012 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,
     # Override to dynamically link the cras (ChromeOS audio) library.
     'use_cras%': 0,
     # Option e.g. for Linux distributions to link pulseaudio directly
@@ skipping 309 matching lines @@
         'base/media_client.h',
         'base/media_file_checker.cc',
         'base/media_file_checker.h',
         'base/media_keys.cc',
         'base/media_keys.h',
         'base/media_log.cc',
         'base/media_log.h',
         'base/media_log_event.h',
         'base/media_permission.cc',
         'base/media_permission.h',
+        'base/media_posix.cc',
         'base/media_switches.cc',
         'base/media_switches.h',
+        'base/media_win.cc',
         'base/mime_util.cc',
         'base/mime_util.h',
         'base/moving_average.cc',
         'base/moving_average.h',
         'base/multi_channel_resampler.cc',
         'base/multi_channel_resampler.h',
         'base/pipeline.cc',
         'base/pipeline.h',
         'base/pipeline_status.h',
         'base/player_tracker.cc',
@@ skipping 275 matching lines @@
           ],
         }, {  # media_use_ffmpeg==0
           # Exclude the sources that depend on ffmpeg.
           'sources!': [
             'base/audio_video_metadata_extractor.cc',
             'base/audio_video_metadata_extractor.h',
             'base/container_names.cc',
             'base/container_names.h',
             'base/media_file_checker.cc',
             'base/media_file_checker.h',
+            'base/media_posix.cc',
             'ffmpeg/ffmpeg_common.cc',
             'ffmpeg/ffmpeg_common.h',
             'filters/audio_file_reader.cc',
             'filters/audio_file_reader.h',
             'filters/blocking_url_protocol.cc',
             'filters/blocking_url_protocol.h',
             'filters/ffmpeg_aac_bitstream_converter.cc',
             'filters/ffmpeg_aac_bitstream_converter.h',
             'filters/ffmpeg_audio_decoder.cc',
             'filters/ffmpeg_audio_decoder.h',
@@ skipping 48 matching lines @@
         ['OS=="android"', {
           'dependencies': [
             'media_android_jni_headers',
             'media_java',
             'player_android',
             'video_capture_android_jni_headers',
           ],
           'sources': [
             'base/media.cc',
             'base/media.h',
+            'base/media_stub.cc',
           ],
           'sources!': [
             'filters/opus_audio_decoder.cc',
             'filters/opus_audio_decoder.h',
             'renderers/default_renderer_factory.cc',
             'renderers/default_renderer_factory.h',
           ],
           'defines': [
             'DISABLE_USER_INPUT_MONITOR',
           ],
@@ skipping 540 matching lines @@
             'filters/ffmpeg_aac_bitstream_converter_unittest.cc',
             'filters/ffmpeg_demuxer_unittest.cc',
             'filters/ffmpeg_glue_unittest.cc',
             'filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc',
             'filters/ffmpeg_video_decoder_unittest.cc',
             'filters/in_memory_url_protocol_unittest.cc',
             'test/pipeline_integration_test.cc',
             'test/pipeline_integration_test_base.cc',
           ],
         }],
-        ['(os_posix==1 and OS!="mac") or (OS=="win" and component!="shared_library" and win_use_allocator_shim==1)', {
+        ['os_posix==1 and OS!="mac"', {
           'conditions': [
             ['use_allocator!="none"', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
         ['OS=="android"', {
           'dependencies': [
@@ skipping 704 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }