diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 00:42:17 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 00:42:17 +0000 |
| commit | 44430f7f48512dc0ae8c45d6313e5b8eb215f67e (patch) | |
| tree | 46927a0c46bb04c581ba702984e1f3fc5d9cb58c /media/base | |
| parent | a355ba5577bed81d17332edb4d027f2ed834de5e (diff) | |
| download | chromium_src-44430f7f48512dc0ae8c45d6313e5b8eb215f67e.zip chromium_src-44430f7f48512dc0ae8c45d6313e5b8eb215f67e.tar.gz chromium_src-44430f7f48512dc0ae8c45d6313e5b8eb215f67e.tar.bz2 | |
Revert 53281 - ffmpeg update with vp3 patches.
switch to av_register_protocol2
video-played-collapse layout test fails and will be fixed later.
BUG=48037
TEST=ffmpeg should still build/run
Review URL: http://codereview.chromium.org/3010016
TBR=fbarchard@chromium.org
Review URL: http://codereview.chromium.org/2805098
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53285 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 f3aa552..5f29a55 100644 --- a/media/base/mock_ffmpeg.cc +++ b/media/base/mock_ffmpeg.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 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, AVRegisterProtocol2(_,_)) + EXPECT_CALL(*this, AVRegisterProtocol(_)) .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_protocol2(URLProtocol* protocol, int size) { - return media::MockFFmpeg::get()->AVRegisterProtocol2(protocol, size); +int av_register_protocol(URLProtocol* protocol) { + return media::MockFFmpeg::get()->AVRegisterProtocol(protocol); } void av_register_all() { diff --git a/media/base/mock_ffmpeg.h b/media/base/mock_ffmpeg.h index 09daf03..836e02b 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_METHOD2(AVRegisterProtocol2, int(URLProtocol* protocol, int size)); + MOCK_METHOD1(AVRegisterProtocol, int(URLProtocol* protocol)); MOCK_METHOD0(AVRegisterAll, void()); MOCK_METHOD1(AVRegisterLockManager, int(int (*cb)(void**, enum AVLockOp))); |