From 8d174a47fce05738c247d1e7f5247b6e26461492 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 6 Mar 2016 20:26:53 -0700 Subject: [PATCH 1/2] system ffmpeg fixes --- media/ffmpeg/ffmpeg_common.h | 5 ----- media/filters/ffmpeg_demuxer.cc | 18 ------------------ 2 files changed, 23 deletions(-) diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h index fa5dfee..db045f3 100644 --- a/media/ffmpeg/ffmpeg_common.h +++ b/media/ffmpeg/ffmpeg_common.h @@ -22,10 +22,6 @@ // Include FFmpeg header files. extern "C" { -// Disable deprecated features which result in spammy compile warnings. This -// list of defines must mirror those in the 'defines' section of BUILD.gn file & -// ffmpeg.gyp file or the headers below will generate different structures! -#define FF_API_CONVERGENCE_DURATION 0 // Upstream libavcodec/utils.c still uses the deprecated // av_dup_packet(), causing deprecation warnings. // The normal fix for such things is to disable the feature as below, @@ -39,7 +35,6 @@ extern "C" { MSVC_PUSH_DISABLE_WARNING(4244); #include #include -#include #include #include #include diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc index 2785c0a..40de4b1 100644 --- a/media/filters/ffmpeg_demuxer.cc +++ b/media/filters/ffmpeg_demuxer.cc @@ -1101,24 +1101,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone(const PipelineStatusCB& status_cb, // If no estimate is found, the stream entry will be kInfiniteDuration(). std::vector start_time_estimates(format_context->nb_streams, kInfiniteDuration()); - const AVFormatInternal* internal = format_context->internal; - if (internal && internal->packet_buffer && - format_context->start_time != static_cast(AV_NOPTS_VALUE)) { - struct AVPacketList* packet_buffer = internal->packet_buffer; - while (packet_buffer != internal->packet_buffer_end) { - DCHECK_LT(static_cast(packet_buffer->pkt.stream_index), - start_time_estimates.size()); - const AVStream* stream = - format_context->streams[packet_buffer->pkt.stream_index]; - if (packet_buffer->pkt.pts != static_cast(AV_NOPTS_VALUE)) { - const base::TimeDelta packet_pts = - ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts); - if (packet_pts < start_time_estimates[stream->index]) - start_time_estimates[stream->index] = packet_pts; - } - packet_buffer = packet_buffer->next; - } - } std::unique_ptr media_tracks(new MediaTracks()); AVStream* audio_stream = NULL; -- 2.9.0