mirror of
https://abf.rosa.ru/djam/chromium-browser-stable-slava86.git
synced 2025-02-24 16:02:56 +00:00
40 lines
2.2 KiB
Diff
40 lines
2.2 KiB
Diff
|
diff -up chromium-55.0.2873.0/media/ffmpeg/ffmpeg_common.h.no-ffmpeg-internal chromium-55.0.2873.0/media/ffmpeg/ffmpeg_common.h
|
||
|
|
--- chromium-55.0.2873.0/media/ffmpeg/ffmpeg_common.h.no-ffmpeg-internal 2016-10-01 13:50:19.637104288 +0200
|
||
|
|
+++ chromium-55.0.2873.0/media/ffmpeg/ffmpeg_common.h 2016-10-01 13:50:19.680103748 +0200
|
||
|
|
@@ -27,7 +27,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-55.0.2873.0/media/filters/ffmpeg_demuxer.cc.no-ffmpeg-internal chromium-55.0.2873.0/media/filters/ffmpeg_demuxer.cc
|
||
|
|
--- chromium-55.0.2873.0/media/filters/ffmpeg_demuxer.cc.no-ffmpeg-internal 2016-10-01 13:50:19.682103722 +0200
|
||
|
|
+++ chromium-55.0.2873.0/media/filters/ffmpeg_demuxer.cc 2016-10-01 13:54:34.142904717 +0200
|
||
|
|
@@ -1186,24 +1186,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;
|
||
|
|
- }
|
||
|
|
- }
|
||
|
|
|
||
|
|
std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());
|
||
|
|
|