FFmpeg fixups for M33 roll. Now with more Opus!

media/ffmpeg/ffmpeg_unittest.cc

 // Copyright (c) 2012 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.
 //
 
@@ skipping 73 matching lines @@
       : av_format_context_(NULL),
         audio_stream_index_(-1),
         video_stream_index_(-1),
         decoded_audio_time_(AV_NOPTS_VALUE),
         decoded_audio_duration_(AV_NOPTS_VALUE),
         decoded_video_time_(AV_NOPTS_VALUE),
         decoded_video_duration_(AV_NOPTS_VALUE),
         duration_(AV_NOPTS_VALUE) {
     InitializeFFmpeg();
 
-    audio_buffer_.reset(avcodec_alloc_frame());
-    video_buffer_.reset(avcodec_alloc_frame());
+    audio_buffer_.reset(av_frame_alloc());
+    video_buffer_.reset(av_frame_alloc());
   }
 
   virtual ~FFmpegTest() {
   }
 
   void OpenAndReadFile(const std::string& name) {
     OpenFile(name);
     OpenCodecs();
     ReadRemainingFile();
   }
@@ skipping 474 matching lines @@
   EXPECT_TRUE(StepDecodeVideo());
   VLOG(1) << decoded_video_time();
 
   SeekTo(0.4);
   ReadRemainingFile();
   EXPECT_TRUE(StepDecodeVideo());
   VLOG(1) << decoded_video_time();
 }
 
 }  // namespace media