system-ffmpeg.patch

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