diff options
| author | chcunningham <chcunningham@chromium.org> | 2015-06-08 19:09:42 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-09 02:10:16 +0000 |
| commit | fd11b3c3aa6730ae1f024811b61913cd63f9d39a (patch) | |
| tree | ddb45f28c335e4faf1bfe59f4253b7b2c8b99003 /media/test/pipeline_integration_test.cc | |
| parent | bb5c7f582a893881639941ca61ed53517716b1a7 (diff) | |
| download | chromium_src-fd11b3c3aa6730ae1f024811b61913cd63f9d39a.zip chromium_src-fd11b3c3aa6730ae1f024811b61913cd63f9d39a.tar.gz chromium_src-fd11b3c3aa6730ae1f024811b61913cd63f9d39a.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
Committed: https://crrev.com/bfef6d6ba82b172ac0e48c80d9ccf1a1ca0ea5c5
Cr-Commit-Position: refs/heads/master@{#332891}
Review URL: https://codereview.chromium.org/1141703002
Cr-Commit-Position: refs/heads/master@{#333423}
Diffstat (limited to 'media/test/pipeline_integration_test.cc')
| -rw-r--r-- | media/test/pipeline_integration_test.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc index dcbb66d..1e89119 100644 --- a/media/test/pipeline_integration_test.cc +++ b/media/test/pipeline_integration_test.cc @@ -631,8 +631,7 @@ class PipelineIntegrationTestHost : public mojo::test::ApplicationTestBase, void SetUp() override { ApplicationTestBase::SetUp(); - if (!IsMediaLibraryInitialized()) - InitializeMediaLibraryForTesting(); + InitializeMediaLibrary(); } protected: |