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

media/tools/omx_test/omx_test.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.
 
 // A test program that drives an OpenMAX video decoder module. This program
 // will take video in elementary stream and read into the decoder.
 //
 // Run the following command to see usage:
 // ./omx_test
 
@@ skipping 255 matching lines @@
 
   // TODO(wjia): add more configurations needed by encoder
   return true;
 }
 
 static bool InitFFmpeg() {
   if (!media::InitializeMediaLibrary(FilePath()))
     return false;
   avcodec_init();
   av_register_all();
-  av_register_protocol2(&kFFmpegFileProtocol, sizeof(kFFmpegFileProtocol));
+  av_register_protocol(&kFFmpegFileProtocol);
   return true;
 }
 
 static void PrintHelp() {
   printf("Using for decoding...\n");
   printf("\n");
   printf("Usage: omx_test --input-file=FILE --codec=CODEC"
              " [--output-file=FILE] [--enable-csc]"
              " [--copy] [--use-ffmpeg]\n");
   printf("    CODEC: h264/mpeg4/h263/vc1\n");
@@ skipping 95 matching lines @@
   if (!test->Initialize()) {
     LOG(ERROR) << "can't initialize this application";
     return -1;
   }
 
   // This will run the decoder until EOS is reached or an error
   // is encountered.
   test->Run();
   return 0;
 }