diff options
| author | chcunningham <chcunningham@chromium.org> | 2015-06-04 12:55:51 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-04 19:57:13 +0000 |
| commit | bfef6d6ba82b172ac0e48c80d9ccf1a1ca0ea5c5 (patch) | |
| tree | e44e230c1eb6a49d331c006de1942e25bf921590 /media/media.gyp | |
| parent | 3e11c986844af1cdda66e72e874763437ef426a0 (diff) | |
| download | chromium_src-bfef6d6ba82b172ac0e48c80d9ccf1a1ca0ea5c5.zip chromium_src-bfef6d6ba82b172ac0e48c80d9ccf1a1ca0ea5c5.tar.gz chromium_src-bfef6d6ba82b172ac0e48c80d9ccf1a1ca0ea5c5.tar.bz2 | |
Chromium changes to statically link ffmpeg.
Motivations:
1. Eliminates a large number of windows crashes hit while loading the DLL (see bugs)
2. Reducing the size of binary (about 400KB on linux, about 265KB on 32bit windows) due to dead-code elimination
3. Simplifying media library initialization (Remove bool-ness, it just works)
Licensing:
We've audited all the licenses for the files we actually use and have the green light from legal as long as we include the license text in the credits.
BUG=435455, 429131, 441908
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1141703002
Cr-Commit-Position: refs/heads/master@{#332891}
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/media/media.gyp b/media/media.gyp index 7e36cff..276f1cf 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -327,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/mime_util.cc', 'base/mime_util.h', 'base/moving_average.cc', @@ -626,7 +624,6 @@ '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', @@ -695,7 +692,6 @@ 'sources': [ 'base/media.cc', 'base/media.h', - 'base/media_stub.cc', ], 'sources!': [ 'filters/opus_audio_decoder.cc', @@ -1256,7 +1252,7 @@ 'test/pipeline_integration_test_base.cc', ], }], - ['os_posix==1 and OS!="mac"', { + ['(os_posix==1 and OS!="mac") or (OS=="win" and component!="shared_library" and win_use_allocator_shim==1)', { 'conditions': [ ['use_allocator!="none"', { 'dependencies': [ |