chrome_frame/test/perf/chrome_frame_perftest.cc - Issue 9317096: Fix media code to work with new 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: chrome_frame/test/perf/chrome_frame_perftest.cc

Issue 9317096: Fix media code to work with new ffmpeg. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Code review fixes. Created 8 years, 10 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:

Index: chrome_frame/test/perf/chrome_frame_perftest.cc

diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc

index 14faa1438826de9363d50e4163ee1df522f3c66f..d6421b2a4c14ecc31dbfa795a380c0e0947aaf58 100644

--- a/chrome_frame/test/perf/chrome_frame_perftest.cc

+++ b/chrome_frame/test/perf/chrome_frame_perftest.cc

@@ -295,8 +295,8 @@ class ChromeFrameStartupTest : public ChromeFramePerfTestBase {

chrome_exe_ = dir_app_.Append(chrome::kBrowserProcessExecutableName);

chrome_frame_dll_ = dir_app_.Append(kChromeFrameDllName);

icu_dll_ = dir_app_.Append(L"icudt.dll");

- avcodec_dll_ = dir_app_.Append(L"avcodec-53.dll");

- avformat_dll_ = dir_app_.Append(L"avformat-53.dll");

+ avcodec_dll_ = dir_app_.Append(L"avcodec-54.dll");

+ avformat_dll_ = dir_app_.Append(L"avformat-54.dll");

avutil_dll_ = dir_app_.Append(L"avutil-51.dll");

}