Revert r53885 "deps roll for new ffmpeg and switch to av_register_protocol2"

media/ffmpeg/ffmpeg_unittest.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.
 
 // ffmpeg_unittests verify that the parts of the FFmpeg API that Chromium uses
 // function as advertised for each media format that Chromium supports.  This
 // mostly includes stuff like reporting proper timestamps, seeking to
 // keyframes, and supporting certain features like reordered_opaque.
 //
 // Known failures as of r53892:
@@ skipping 383 matching lines @@
     }
 
     FilePath path;
     PathService::Get(base::DIR_MODULE, &path);
     EXPECT_TRUE(InitializeMediaLibrary(path))
         << "Could not initialize media library.";
 
     avcodec_init();
     av_log_set_level(AV_LOG_FATAL);
     av_register_all();
-    av_register_protocol2(&kFFmpegFileProtocol, sizeof(kFFmpegFileProtocol));
+    av_register_protocol(&kFFmpegFileProtocol);
     initialized = true;
   }
 
   AVFormatContext* av_format_context_;
   int audio_stream_index_;
   int video_stream_index_;
   AVPacketQueue audio_packets_;
   AVPacketQueue video_packets_;
 
   scoped_ptr_malloc<int16, media::ScopedPtrAVFree> audio_buffer_;
@@ skipping 222 matching lines @@
   SeekTo(0.4);
   ReadRemainingFile();
   EXPECT_TRUE(StepDecodeVideo());
   LOG(INFO) << decoded_video_time();
 
   CloseCodecs();
   CloseFile();
 }
 
 }  // namespace media