FFmpeg fixups for M33 roll. Now with more Opus!

media/filters/audio_file_reader.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.
 
 #include "media/filters/audio_file_reader.h"
 
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "media/base/audio_bus.h"
 #include "media/ffmpeg/ffmpeg_common.h"
@@ skipping 114 matching lines @@
       "AudioFileReader::Read() : reader is not opened!";
 
   DCHECK_EQ(audio_bus->channels(), channels());
   if (audio_bus->channels() != channels())
     return 0;
 
   size_t bytes_per_sample = av_get_bytes_per_sample(codec_context_->sample_fmt);
 
   // Holds decoded audio.
   scoped_ptr_malloc<AVFrame, ScopedPtrAVFreeFrame> av_frame(
-      avcodec_alloc_frame());
+      av_frame_alloc());
 
   // Read until we hit EOF or we've read the requested number of frames.
   AVPacket packet;
   int current_frame = 0;
   bool continue_decoding = true;
 
   while (current_frame < audio_bus->frames() && continue_decoding &&
          av_read_frame(glue_->format_context(), &packet) >= 0 &&
          av_dup_packet(&packet) >= 0) {
     // Skip packets from other streams.
@@ skipping 91 matching lines @@
   // Zero any remaining frames.
   audio_bus->ZeroFramesPartial(
       current_frame, audio_bus->frames() - current_frame);
 
   // Returns the actual number of sample-frames decoded.
   // Ideally this represents the "true" exact length of the file.
   return current_frame;
 }
 
 }  // namespace media