diff -up chromium-49.0.2612.0/media/ffmpeg/ffmpeg_common.h.no-ffmpeg-internal chromium-49.0.2612.0/media/ffmpeg/ffmpeg_common.h --- chromium-49.0.2612.0/media/ffmpeg/ffmpeg_common.h.no-ffmpeg-internal 2016-01-08 10:55:26.031940435 +0100 +++ chromium-49.0.2612.0/media/ffmpeg/ffmpeg_common.h 2016-01-08 10:55:26.082939473 +0100 @@ -26,7 +26,6 @@ extern "C" { MSVC_PUSH_DISABLE_WARNING(4244); #include <libavcodec/avcodec.h> #include <libavformat/avformat.h> -#include <libavformat/internal.h> #include <libavformat/avio.h> #include <libavutil/avutil.h> #include <libavutil/imgutils.h> diff -up chromium-49.0.2612.0/media/filters/ffmpeg_demuxer.cc.no-ffmpeg-internal chromium-49.0.2612.0/media/filters/ffmpeg_demuxer.cc --- chromium-49.0.2612.0/media/filters/ffmpeg_demuxer.cc.no-ffmpeg-internal 2016-01-08 10:55:26.083939454 +0100 +++ chromium-49.0.2612.0/media/filters/ffmpeg_demuxer.cc 2016-01-08 11:56:40.929435456 +0100 @@ -1034,25 +1034,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone // If no estimate is found, the stream entry will be kInfiniteDuration(). std::vector<base::TimeDelta> 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<int64_t>(AV_NOPTS_VALUE)) { - struct AVPacketList* packet_buffer = internal->packet_buffer; - while (packet_buffer != internal->packet_buffer_end) { - DCHECK_LT(static_cast<size_t>(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<int64_t>(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; - } - } - AVStream* audio_stream = NULL; AudioDecoderConfig audio_config; AVStream* video_stream = NULL;