Chromium changes for static linking ffmpeg

media/media.gyp

Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index f5e797b61fe5ea05cc3abeccf93be9587a92859d..5db25bccd179cb05ba94d86fd99e0e8f8eb6e0f1 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -313,6 +313,7 @@
         'base/mac/video_frame_mac.h',
         'base/mac/videotoolbox_glue.h',
         'base/mac/videotoolbox_glue.mm',
+        'base/media_init.cc',

[M-A Ruel, 2015/05/15 23:51:29]

sort

[chcunningham, 2015/05/16 04:36:26]

deleted.

         'base/media.cc',
         'base/media.h',
         'base/media_client.cc',
@@ -326,10 +327,8 @@
         '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/moving_average.cc',
         'base/moving_average.h',
         'base/multi_channel_resampler.cc',
@@ -615,6 +614,7 @@
         }, {  # media_use_ffmpeg==0
           # Exclude the sources that depend on ffmpeg.
           'sources!': [
+            'base/media_init.cc',

[M-A Ruel, 2015/05/15 23:51:29]

sort

[chcunningham, 2015/05/16 04:36:25]

deleted.

             'base/audio_video_metadata_extractor.cc',
             'base/audio_video_metadata_extractor.h',
             'base/container_names.cc',
@@ -644,6 +644,10 @@
             'filters/in_memory_url_protocol.cc',
             'filters/in_memory_url_protocol.h',
           ],
+          # Stub out ffmpeg initializer
+          'sources': [
+            'base/media_init_stub.cc',
+          ],
           'defines': [
             'MEDIA_DISABLE_FFMPEG',
           ],
@@ -690,7 +694,6 @@
           'sources': [
             'base/media.cc',
             'base/media.h',
-            'base/media_stub.cc',
           ],
           'sources!': [
             'filters/opus_audio_decoder.cc',
@@ -1258,6 +1261,16 @@
             }],
           ],
         }],
+        ['OS=="win"', {

[M-A Ruel, 2015/05/15 23:51:29]

['OS=="win" and win_use_allocator_shim==1', {

I don't see any reason to use embedded conditions.

[chcunningham, 2015/05/16 04:36:25]

ended up combining this with the above condition 

+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              # TODO(chcunningham): This seems to not be picked up? FFmpeg allocator test (which should be removed) still fails.
+              'dependencies': [
+                '../base/allocator/allocator.gyp:allocator',
+              ],
+            }],
+          ],
+        }],
         ['OS=="android"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',