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

7 files changed, 10 insertions, 9 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)));
 
diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h
index 10f67d2..7b73781 100644
--- a/media/ffmpeg/ffmpeg_common.h
+++ b/media/ffmpeg/ffmpeg_common.h
@@ -18,6 +18,7 @@ extern "C" {
 MSVC_PUSH_DISABLE_WARNING(4244);
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
+#include <libavformat/avio.h>
 #include <libavutil/avutil.h>
 #include <libavutil/log.h>
 MSVC_POP_WARNING();
diff --git a/media/filters/ffmpeg_glue.cc b/media/filters/ffmpeg_glue.cc
index cf06f35..6f637c3 100644
--- a/media/filters/ffmpeg_glue.cc
+++ b/media/filters/ffmpeg_glue.cc
@@ -134,7 +134,7 @@ FFmpegGlue::FFmpegGlue() {
 
   // Register our protocol glue code with FFmpeg.
   avcodec_init();
-  av_register_protocol(&kFFmpegURLProtocol);
+  av_register_protocol2(&kFFmpegURLProtocol, sizeof(kFFmpegURLProtocol));
   av_lockmgr_register(&LockManagerOperation);
 
   // Now register the rest of FFmpeg.
diff --git a/media/test/ffmpeg_tests/ffmpeg_tests.cc b/media/test/ffmpeg_tests/ffmpeg_tests.cc
index a967bc3..f8da45c 100644
--- a/media/test/ffmpeg_tests/ffmpeg_tests.cc
+++ b/media/test/ffmpeg_tests/ffmpeg_tests.cc
@@ -115,7 +115,7 @@ int main(int argc, const char** argv) {
   avcodec_init();
   av_log_set_level(verbose_level);
   av_register_all();
-  av_register_protocol(&kFFmpegFileProtocol);
+  av_register_protocol2(&kFFmpegFileProtocol, sizeof(kFFmpegFileProtocol));
   AVFormatContext* format_context = NULL;
   // av_open_input_file wants a char*, which can't work with wide paths.
   // So we assume ASCII on Windows.  On other platforms we can pass the
diff --git a/media/tools/media_bench/media_bench.cc b/media/tools/media_bench/media_bench.cc
index cdc2560..939e35f 100644
--- a/media/tools/media_bench/media_bench.cc
+++ b/media/tools/media_bench/media_bench.cc
@@ -223,7 +223,7 @@ int main(int argc, const char** argv) {
   avcodec_init();
   av_log_set_level(verbose_level);
   av_register_all();
-  av_register_protocol(&kFFmpegFileProtocol);
+  av_register_protocol2(&kFFmpegFileProtocol, sizeof(kFFmpegFileProtocol));
   AVFormatContext* format_context = NULL;
   // av_open_input_file wants a char*, which can't work with wide paths.
   // So we assume ASCII on Windows.  On other platforms we can pass the
diff --git a/media/tools/omx_test/omx_test.cc b/media/tools/omx_test/omx_test.cc
index 5203eb0..ac885b2 100644
--- a/media/tools/omx_test/omx_test.cc
+++ b/media/tools/omx_test/omx_test.cc
@@ -273,7 +273,7 @@ static bool InitFFmpeg() {
     return false;
   avcodec_init();
   av_register_all();
-  av_register_protocol(&kFFmpegFileProtocol);
+  av_register_protocol2(&kFFmpegFileProtocol, sizeof(kFFmpegFileProtocol));
   return true;
 }