diff options
author | Pawel Hajdan, Jr <phajdan.jr@gentoo.org> | 2015-09-30 22:29:16 +0200 |
---|---|---|
committer | Pawel Hajdan, Jr <phajdan.jr@gentoo.org> | 2015-09-30 22:29:16 +0200 |
commit | de743f65ee5c615cb4aa9b6118c2a9fe414eb484 (patch) | |
tree | 84caa1a9a12df0c5b6fec78e7470c8f51c562534 /www-client/chromium/files | |
parent | 14bd9ad738d450eec6117f3dccd8c6465be0692f (diff) | |
download | gentoo-de743f65ee5c615cb4aa9b6118c2a9fe414eb484.tar.gz gentoo-de743f65ee5c615cb4aa9b6118c2a9fe414eb484.tar.xz |
www-client/chromium: use system ffmpeg
This is based on patch by Andreas Cadhalpun
from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=763632#29
Also dropping ~arm.
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'www-client/chromium/files')
-rw-r--r-- | www-client/chromium/files/chromium-system-ffmpeg-r0.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r0.patch b/www-client/chromium/files/chromium-system-ffmpeg-r0.patch new file mode 100644 index 00000000000..667e0ecb2a7 --- /dev/null +++ b/www-client/chromium/files/chromium-system-ffmpeg-r0.patch @@ -0,0 +1,54 @@ +diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h +index 677bd76..23a21f8 100644 +--- a/media/ffmpeg/ffmpeg_common.h ++++ b/media/ffmpeg/ffmpeg_common.h +@@ -19,20 +19,12 @@ + + // 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 the ffmpeg.gyp +-// file or the headers below will generate different structures. +-#define FF_API_PIX_FMT_DESC 0 +-#define FF_API_OLD_DECODE_AUDIO 0 +-#define FF_API_DESTRUCT_PACKET 0 +-#define FF_API_GET_BUFFER 0 + + // Temporarily disable possible loss of data warning. + // TODO(scherkus): fix and upstream the compiler warnings. + 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 --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc +index 155e980..7ba327a 100644 +--- a/media/filters/ffmpeg_demuxer.cc ++++ b/media/filters/ffmpeg_demuxer.cc +@@ -966,24 +966,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone(const PipelineStatusCB& status_cb, + // 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>(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>(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; |