system-ffmpeg.patch

   1 --- a/media/ffmpeg/ffmpeg_common.h      2015-11-27 12:01:56.155462264 +0000
   2 +++ b/media/ffmpeg/ffmpeg_common.h      2015-11-27 12:03:03.348846300 +0000
   3 @@ -19,10 +19,6 @@
   4
   5  // Include FFmpeg header files.
   6  extern "C" {
   7 -// Disable deprecated features which result in spammy compile warnings.  This
   8 -// list of defines must mirror those in the 'defines' section of BUILD.gn file &
   9 -// ffmpeg.gyp file or the headers below will generate different structures!
  10 -#define FF_API_CONVERGENCE_DURATION 0
  11  // Upstream libavcodec/utils.c still uses the deprecated
  12  // av_dup_packet(), causing deprecation warnings.
  13  // The normal fix for such things is to disable the feature as below,
  14 @@ -36,7 +32,6 @@
  15  MSVC_PUSH_DISABLE_WARNING(4244);
  16  #include <libavcodec/avcodec.h>
  17  #include <libavformat/avformat.h>
  18 -#include <libavformat/internal.h>
  19  #include <libavformat/avio.h>
  20  #include <libavutil/avutil.h>
  21  #include <libavutil/imgutils.h>
  22 diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
  23 index 155e980..7ba327a 100644
  24 --- a/media/filters/ffmpeg_demuxer.cc
  25 +++ b/media/filters/ffmpeg_demuxer.cc
  26 @@ -966,24 +966,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone(const PipelineStatusCB& status_cb,
  27    // If no estimate is found, the stream entry will be kInfiniteDuration().
  28    std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
  29                                                      kInfiniteDuration());
  30 -  const AVFormatInternal* internal = format_context->internal;
  31 -  if (internal && internal->packet_buffer &&
  32 -      format_context->start_time != static_cast<int64>(AV_NOPTS_VALUE)) {
  33 -    struct AVPacketList* packet_buffer = internal->packet_buffer;
  34 -    while (packet_buffer != internal->packet_buffer_end) {
  35 -      DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
  36 -                start_time_estimates.size());
  37 -      const AVStream* stream =
  38 -          format_context->streams[packet_buffer->pkt.stream_index];
  39 -      if (packet_buffer->pkt.pts != static_cast<int64>(AV_NOPTS_VALUE)) {
  40 -        const base::TimeDelta packet_pts =
  41 -            ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
  42 -        if (packet_pts < start_time_estimates[stream->index])
  43 -          start_time_estimates[stream->index] = packet_pts;
  44 -      }
  45 -      packet_buffer = packet_buffer->next;
  46 -    }
  47 -  }
  48
  49    AVStream* audio_stream = NULL;
  50    AudioDecoderConfig audio_config;