New FFmpeg public API headers to match our source tarball in deps.

media/filters/ffmpeg_audio_decoder.cc

 // 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/data_buffer.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
 #include "media/filters/ffmpeg_common.h"
 #include "media/filters/ffmpeg_demuxer.h"
 
 namespace media {
@@ skipping 56 matching lines @@
     host_->Error(PIPELINE_ERROR_OUT_OF_MEMORY);
     return false;
   }
   return true;
 }
 
 void FFmpegAudioDecoder::OnStop() {
 }
 
 void FFmpegAudioDecoder::OnDecode(Buffer* input) {
+  // Due to FFmpeg API changes we no longer have const read-only pointers.
+  AVPacket packet;
+  av_init_packet(&packet);
+  packet.data = const_cast<uint8*>(input->GetData());
+  packet.size = input->GetDataSize();
+
   int16_t* output_buffer = reinterpret_cast<int16_t*>(output_buffer_.get());
   int output_buffer_size = kOutputBufferSize;
-  int result = avcodec_decode_audio2(codec_context_,
+  int result = avcodec_decode_audio3(codec_context_,
                                      output_buffer,
                                      &output_buffer_size,
-                                     input->GetData(),
-                                     input->GetDataSize());
+                                     &packet);
 
   // TODO(ajwong): Consider if kOutputBufferSize should just be an int instead
   // of a size_t.
   if (result < 0 ||
       output_buffer_size < 0 ||
       static_cast<size_t>(output_buffer_size) > kOutputBufferSize) {
     host_->Error(PIPELINE_ERROR_DECODE);
   } else if (result == 0) {
     // TODO(scherkus): does this mark EOS? Do we want to fulfill a read request
     // with zero size?
@@ skipping 20 matching lines @@
 base::TimeDelta FFmpegAudioDecoder::CalculateDuration(size_t size) {
   int64 denominator = codec_context_->channels *
       av_get_bits_per_sample_format(codec_context_->sample_fmt) / 8 *
       codec_context_->sample_rate;
   double microseconds = size /
       (denominator / static_cast<double>(base::Time::kMicrosecondsPerSecond));
   return base::TimeDelta::FromMicroseconds(static_cast<int64>(microseconds));
 }
 
 }  // namespace