Switch to using avcodec_decode_audio4, avcodec_alloc_context3.

media/filters/ffmpeg_audio_decoder.h

 // 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.
 
 #ifndef MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_
 #define MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_
 
 #include <list>
 
 #include "base/callback.h"
 #include "base/message_loop.h"
 #include "media/base/audio_decoder.h"
 
 struct AVCodecContext;
+struct AVFrame;
 
 namespace media {
 
 class DataBuffer;
 class DecoderBuffer;
 
 class MEDIA_EXPORT FFmpegAudioDecoder : public AudioDecoder {
  public:
   FFmpegAudioDecoder(const base::Callback<MessageLoop*()>& message_loop_cb);
 
@@ skipping 42 matching lines @@
   StatisticsCB statistics_cb_;
   AVCodecContext* codec_context_;
 
   // Decoded audio format.
   int bits_per_channel_;
   ChannelLayout channel_layout_;
   int samples_per_second_;
 
   base::TimeDelta estimated_next_timestamp_;
 
-  // Holds decoded audio. As required by FFmpeg, input/output buffers should
-  // be allocated with suitable padding and alignment. av_malloc() provides
-  // us that guarantee.
-  const int decoded_audio_size_;
-  uint8* decoded_audio_;  // Allocated via av_malloc().
+  // Holds decoded audio.
+  AVFrame* av_frame_;
 
   ReadCB read_cb_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(FFmpegAudioDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_