diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 00:14:02 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 00:14:02 +0000 |
| commit | 684f665ff630ccae011fb279276b194ef95c631e (patch) | |
| tree | ca609197ac66dcc912a30898df6695b2dd2036d7 /media/base/mock_ffmpeg.cc | |
| parent | 27f41125a1978d29304e7582759a2857a0130a21 (diff) | |
| download | chromium_src-684f665ff630ccae011fb279276b194ef95c631e.zip chromium_src-684f665ff630ccae011fb279276b194ef95c631e.tar.gz chromium_src-684f665ff630ccae011fb279276b194ef95c631e.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53281 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/mock_ffmpeg.cc')
| -rw-r--r-- | media/base/mock_ffmpeg.cc | 8 |
1 files changed, 4 insertions, 4 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() { |