| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657 |
- Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org>
- Date: 2017-03-18
- Initial Package Version: 57.0.2987.110
- Upstream Status: Not submitted
- Origin: Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-system-ffmpeg-r4.patch
- Description: Allows building with system provided ffmpeg.
- --- a/media/ffmpeg/ffmpeg_common.h.orig 2016-09-09 13:16:07.757294768 +0000
- +++ b/media/ffmpeg/ffmpeg_common.h 2016-09-09 13:16:41.705989273 +0000
- @@ -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 FFmpeg's
- -// BUILD.gn 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,
- @@ -35,7 +35,6 @@
- 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>
- --- a/media/filters/ffmpeg_demuxer.cc.orig 2016-09-09 14:21:40.185828912 +0000
- +++ b/media/filters/ffmpeg_demuxer.cc 2016-09-09 14:21:52.894089352 +0000
- @@ -1185,24 +1185,6 @@
- // 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());
-
|
