Revert 53281 - ffmpeg update with vp3 patches....

media/test/ffmpeg_tests/ffmpeg_tests.cc

 // 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.
 
 // Software qualification test for FFmpeg.  This test is used to certify that
 // software decoding quality and performance of FFmpeg meets a mimimum
 // standard.
 
 #include <iomanip>
 #include <iostream>
@@ skipping 97 matching lines @@
   std::ostream* log_out = &std::cout;
 #if defined(ENABLE_WINDOWS_EXCEPTIONS)
   // Catch exceptions so this tool can be used in automated testing.
   __try {
 #endif
 
   // Register FFmpeg and attempt to open file.
   avcodec_init();
   av_log_set_level(verbose_level);
   av_register_all();
-  av_register_protocol2(&kFFmpegFileProtocol, sizeof(kFFmpegFileProtocol));
+  av_register_protocol(&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
   // path bytes through verbatim.
 #if defined(OS_WIN)
   std::string string_path = WideToASCII(in_path.value());
 #else
   const std::string& string_path = in_path.value();
 #endif
   int result = av_open_input_file(&format_context, string_path.c_str(),
@@ skipping 364 matching lines @@
   } __except(EXCEPTION_EXECUTE_HANDLER) {
     *log_out << "  Exception:" << std::setw(11) << GetExceptionCode()
              << " " << in_path.value() << std::endl;
     return 1;
   }
 #endif
   CommandLine::Reset();
   return 0;
 }