diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-28 22:52:42 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-28 22:52:42 +0000 |
| commit | 5a671d2b25a1fcfb64101a09957edc4f802aa489 (patch) | |
| tree | 217b50903305e893e16b8092c799378bc303c7f2 /media/base | |
| parent | a53e0683ad312c10f5772dadbfd5df33c45f03c1 (diff) | |
| download | chromium_src-5a671d2b25a1fcfb64101a09957edc4f802aa489.zip chromium_src-5a671d2b25a1fcfb64101a09957edc4f802aa489.tar.gz chromium_src-5a671d2b25a1fcfb64101a09957edc4f802aa489.tar.bz2 | |
ffmpeg roll for chromium source and windows binaries
Includes fix for XP Perf by reducing webm library size by 1.6 MB
BUG=48037,50507
TEST=XP Perf and layout tests should pass
Review URL: http://codereview.chromium.org/3030024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54053 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
| -rw-r--r-- | media/base/mock_ffmpeg.cc | 8 | ||||
| -rw-r--r-- | media/base/mock_ffmpeg.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/media/base/mock_ffmpeg.cc b/media/base/mock_ffmpeg.cc index 5f29a55..f3aa552 100644 --- a/media/base/mock_ffmpeg.cc +++ b/media/base/mock_ffmpeg.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -33,7 +33,7 @@ MockFFmpeg::MockFFmpeg() EXPECT_CALL(*this, AVCodecInit()) .Times(AtMost(1)) .WillOnce(Return()); - EXPECT_CALL(*this, AVRegisterProtocol(_)) + EXPECT_CALL(*this, AVRegisterProtocol2(_,_)) .Times(AtMost(1)) .WillOnce(DoAll(SaveArg<0>(&protocol_), Return(0))); EXPECT_CALL(*this, AVRegisterAll()) @@ -89,8 +89,8 @@ void avcodec_init() { media::MockFFmpeg::get()->AVCodecInit(); } -int av_register_protocol(URLProtocol* protocol) { - return media::MockFFmpeg::get()->AVRegisterProtocol(protocol); +int av_register_protocol2(URLProtocol* protocol, int size) { + return media::MockFFmpeg::get()->AVRegisterProtocol2(protocol, size); } void av_register_all() { diff --git a/media/base/mock_ffmpeg.h b/media/base/mock_ffmpeg.h index 836e02b..09daf03 100644 --- a/media/base/mock_ffmpeg.h +++ b/media/base/mock_ffmpeg.h @@ -19,7 +19,7 @@ class MockFFmpeg { // TODO(ajwong): Organize this class, and make sure that all mock entrypoints // are still used. MOCK_METHOD0(AVCodecInit, void()); - MOCK_METHOD1(AVRegisterProtocol, int(URLProtocol* protocol)); + MOCK_METHOD2(AVRegisterProtocol2, int(URLProtocol* protocol, int size)); MOCK_METHOD0(AVRegisterAll, void()); MOCK_METHOD1(AVRegisterLockManager, int(int (*cb)(void**, enum AVLockOp))); |