summaryrefslogtreecommitdiffstats
path: root/media/test/pipeline_integration_test.cc
diff options
context:
space:
mode:
authorchcunningham <chcunningham@chromium.org>2015-06-04 12:55:51 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-04 19:57:13 +0000
commitbfef6d6ba82b172ac0e48c80d9ccf1a1ca0ea5c5 (patch)
treee44e230c1eb6a49d331c006de1942e25bf921590 /media/test/pipeline_integration_test.cc
parent3e11c986844af1cdda66e72e874763437ef426a0 (diff)
downloadchromium_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/test/pipeline_integration_test.cc')
-rw-r--r--media/test/pipeline_integration_test.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index 78ebfe0..5ae62a0 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: