media/test/pipeline_integration_test.cc - Issue 1161183003: Revert "Chromium changes to statically link ffmpeg."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/test/pipeline_integration_test.cc

Issue 1161183003: Revert "Chromium changes to statically link ffmpeg." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: media/test/pipeline_integration_test.cc

diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc

index 5ae62a0554647a4386f418f69ad26745e00dfb51..78ebfe053dde6cb089d68c5a68193a5562a6b024 100644

--- a/media/test/pipeline_integration_test.cc

+++ b/media/test/pipeline_integration_test.cc

@@ -631,7 +631,8 @@ class PipelineIntegrationTestHost : public mojo::test::ApplicationTestBase,

void SetUp() override {

ApplicationTestBase::SetUp();

- InitializeMediaLibrary();

+ if (!IsMediaLibraryInitialized())

+ InitializeMediaLibraryForTesting();

}

protected:

« no previous file with comments | « media/mojo/services/renderer_config_default.cc ('k') | remoting/base/run_all_unittests.cc » ('j') | no next file with comments »