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

2 files changed, 2 insertions, 2 deletions

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;
 }