ffmpeg roll for chromium source and windows binaries

Includes fix for XP Perf by reducing webm library size by 1.6 MB
BUG=48037,50507
TEST=XP Perf and layout tests should pass

Review URL: http://codereview.chromium.org/3030024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54053 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 7e33b81..dae6921 100644
--- a/media/tools/media_bench/media_bench.cc
+++ b/media/tools/media_bench/media_bench.cc
@@ -224,7 +224,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 0d7e972..777f55a 100644
--- a/media/tools/omx_test/omx_test.cc
+++ b/media/tools/omx_test/omx_test.cc
@@ -274,7 +274,7 @@ static bool InitFFmpeg() {
     return false;
   avcodec_init();
   av_register_all();
-  av_register_protocol(&kFFmpegFileProtocol);
+  av_register_protocol2(&kFFmpegFileProtocol, sizeof(kFFmpegFileProtocol));
   return true;
 }