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

media/base/mock_ffmpeg.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
 
 #include "media/base/mock_ffmpeg.h"
 
 #include "base/logging.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 
 using ::testing::_;
 using ::testing::AtMost;
@@ skipping 14 matching lines @@
   //
   // TODO(scherkus): this feels gross and I need to think of a way to better
   // inject/mock singletons.
   if (!protocol_) {
     EXPECT_CALL(*this, AVLogSetLevel(AV_LOG_QUIET))
         .Times(AtMost(1))
         .WillOnce(Return());
     EXPECT_CALL(*this, AVCodecInit())
         .Times(AtMost(1))
         .WillOnce(Return());
-    EXPECT_CALL(*this, AVRegisterProtocol2(_,_))
+    EXPECT_CALL(*this, AVRegisterProtocol(_))
         .Times(AtMost(1))
         .WillOnce(DoAll(SaveArg<0>(&protocol_), Return(0)));
     EXPECT_CALL(*this, AVRegisterAll())
         .Times(AtMost(1))
         .WillOnce(Return());
   }
   // av_lockmgr_register() is also called from ~FFmpegLock(), so we expect
   // it to be called at the end.
   EXPECT_CALL(*this, AVRegisterLockManager(_))
     .Times(AtMost(2))
@@ skipping 35 matching lines @@
   packet->data = NULL;
   packet->size = 0;
 }
 
 // FFmpeg stubs that delegate to the FFmpegMock instance.
 extern "C" {
 void avcodec_init() {
   media::MockFFmpeg::get()->AVCodecInit();
 }
 
-int av_register_protocol2(URLProtocol* protocol, int size) {
-  return media::MockFFmpeg::get()->AVRegisterProtocol2(protocol, size);
+int av_register_protocol(URLProtocol* protocol) {
+  return media::MockFFmpeg::get()->AVRegisterProtocol(protocol);
 }
 
 void av_register_all() {
   media::MockFFmpeg::get()->AVRegisterAll();
 }
 
 int av_lockmgr_register(int (*cb)(void**, enum AVLockOp)) {
   media::MockFFmpeg* mock = media::MockFFmpeg::get();
   // Here |mock| may be NULL when this function is called from ~FFmpegGlue().
   if (mock != NULL) {
@@ skipping 116 matching lines @@
   media::MockFFmpeg::get()->AVLogSetLevel(level);
 }
 
 void av_destruct_packet(AVPacket *pkt) {
   media::MockFFmpeg::get()->AVDestructPacket(pkt);
 }
 
 }  // extern "C"
 
 }  // namespace media