diff options
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))); |