diff options
Diffstat (limited to 'dev-util/electron/files/chromium-system-ffmpeg-r0.patch')
-rw-r--r-- | dev-util/electron/files/chromium-system-ffmpeg-r0.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/dev-util/electron/files/chromium-system-ffmpeg-r0.patch b/dev-util/electron/files/chromium-system-ffmpeg-r0.patch deleted file mode 100644 index 667e0ecb2a72..000000000000 --- a/dev-util/electron/files/chromium-system-ffmpeg-r0.patch +++ /dev/null @@ -1,54 +0,0 @@ -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; |