diff options
| author | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 22:32:14 +0000 |
|---|---|---|
| committer | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 22:32:14 +0000 |
| commit | 859b463585079cc5c4f5b6ae97602988538aeeec (patch) | |
| tree | 2d03dc61a3f77a4aa5a6b5f212c3e8691527dbd9 /chrome_frame/test/perf | |
| parent | 3e1c8fedc6c736caf16ad356d6e99768da49f47c (diff) | |
| download | chromium_src-859b463585079cc5c4f5b6ae97602988538aeeec.zip chromium_src-859b463585079cc5c4f5b6ae97602988538aeeec.tar.gz chromium_src-859b463585079cc5c4f5b6ae97602988538aeeec.tar.bz2 | |
Second attempt to land ffmpeg roll.
Attempt 2 at landing http://codereview.chromium.org/9317096/
Same as before except for fixes in checkperms/
However, fixes have landed elsewhere for:
- mp3 decode issue.
- FrameRateNoVsyncCanvasInternalTest.fishbowl/0
BUG=110776
TEST=unittests, layouttests, trybots, perf tests...
Review URL: https://chromiumcodereview.appspot.com/9447029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124501 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/perf')
| -rw-r--r-- | chrome_frame/test/perf/chrome_frame_perftest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc index 14faa14..d6421b2 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"); } |