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

media/filters/ffmpeg_video_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/video_frame_impl.h"
 #include "media/filters/ffmpeg_common.h"
 #include "media/filters/ffmpeg_demuxer.h"
 #include "media/filters/ffmpeg_video_decoder.h"
 
 namespace media {
@@ skipping 63 matching lines @@
 void FFmpegVideoDecoder::OnDecode(Buffer* buffer) {
   // Check for end of stream.
   // TODO(scherkus): check for end of stream.
 
   // Queue the incoming timestamp.
   TimeTuple times;
   times.timestamp = buffer->GetTimestamp();
   times.duration = buffer->GetDuration();
   time_queue_.push(times);
 
-  // Cast everything to FFmpeg types.
-  const uint8_t* data_in = buffer->GetData();
-  const size_t size_in = buffer->GetDataSize();
+  // Create a packet for input data.
+  // Due to FFmpeg API changes we no longer have const read-only pointers.
+  AVPacket packet;
+  av_init_packet(&packet);
+  packet.data = const_cast<uint8*>(buffer->GetData());
+  packet.size = buffer->GetDataSize();
 
   // We don't allocate AVFrame on the stack since different versions of FFmpeg
   // may change the size of AVFrame, causing stack corruption.  The solution is
   // to let FFmpeg allocate the structure via avcodec_alloc_frame().
   int decoded = 0;
   scoped_ptr_malloc<AVFrame, ScopedPtrAVFree> yuv_frame(avcodec_alloc_frame());
-  int result = avcodec_decode_video(codec_context_, yuv_frame.get(), &decoded,
-                                    data_in, size_in);
+  int result = avcodec_decode_video2(codec_context_, yuv_frame.get(), &decoded,
+                                     &packet);
 
   // Log the problem if we can't decode a video frame.
   if (result < 0) {
     LOG(INFO) << "Error decoding a video frame with timestamp: "
               << buffer->GetTimestamp().InMicroseconds() << " us"
               << " , duration: "
               << buffer->GetDuration().InMicroseconds() << " us"
               << " , packet size: "
               << buffer->GetDataSize() << " bytes";
   }
@@ skipping 77 matching lines @@
   }
   DCHECK(bytes_per_line <= source_stride && bytes_per_line <= dest_stride);
   for (size_t i = 0; i < copy_lines; ++i) {
     memcpy(dest, source, bytes_per_line);
     source += source_stride;
     dest += dest_stride;
   }
 }
 
 }  // namespace