Djam/chromium-browser-stable
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/chromium-browser-stable.git synced 2025-02-24 15:12:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

added losen patches

Browse source
This commit is contained in:
Tigro 2016-02-09 13:47:20 +03:00
parent 9d73931269
commit b36803457f
2 changed files with 82 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
chromium-43-no-ffmpeg-internal.patch Normal file
View file

@ -0,0 +1,40 @@
diff -up chromium-43.0.2357.2/media/ffmpeg/ffmpeg_common.h.no-ffmpeg-internal chromium-43.0.2357.2/media/ffmpeg/ffmpeg_common.h
--- chromium-43.0.2357.2/media/ffmpeg/ffmpeg_common.h.no-ffmpeg-internal 2015-04-06 22:56:30.611343967 +0200
+++ chromium-43.0.2357.2/media/ffmpeg/ffmpeg_common.h 2015-04-06 22:57:29.507220212 +0200
@@ -25,7 +25,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-43.0.2357.2/media/filters/ffmpeg_demuxer.cc.no-ffmpeg-internal chromium-43.0.2357.2/media/filters/ffmpeg_demuxer.cc
--- chromium-43.0.2357.2/media/filters/ffmpeg_demuxer.cc.no-ffmpeg-internal 2015-04-04 11:58:19.000000000 +0200
+++ chromium-43.0.2357.2/media/filters/ffmpeg_demuxer.cc 2015-04-06 23:03:42.158107294 +0200
@@ -838,25 +838,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>(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;
AVStream* video_stream = NULL;

42
fix_for_system_ffmpeg_ABI.patch Normal file
View file

@ -0,0 +1,42 @@
diff -up chromium-48.0.2564.8/media/ffmpeg/ffmpeg_common.h.disable_ffmpeg_api_change chromium-48.0.2564.8/media/ffmpeg/ffmpeg_common.h
--- chromium-48.0.2564.8/media/ffmpeg/ffmpeg_common.h.disable_ffmpeg_api_change 2015-11-18 13:16:05.867971946 +0100
+++ chromium-48.0.2564.8/media/ffmpeg/ffmpeg_common.h 2015-11-18 13:19:20.130249467 +0100
@@ -19,18 +19,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 BUILD.gn file &
-// ffmpeg.gyp 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,
-// but the upstream code does not yet compile with it disabled.
-// (In this case, the fix is replacing the call with a new function.)
-// In the meantime, we directly disable those warnings in the C file.
-//#define FF_API_AVPACKET_OLD_API 0
-
// Temporarily disable possible loss of data warning.
// TODO(scherkus): fix and upstream the compiler warnings.
MSVC_PUSH_DISABLE_WARNING(4244);
diff -up chromium-48.0.2564.8/third_party/ffmpeg/ffmpeg.gyp.disable_ffmpeg_api_change chromium-48.0.2564.8/third_party/ffmpeg/ffmpeg.gyp
--- chromium-48.0.2564.8/third_party/ffmpeg/ffmpeg.gyp.disable_ffmpeg_api_change 2015-11-18 13:16:05.869971908 +0100
+++ chromium-48.0.2564.8/third_party/ffmpeg/ffmpeg.gyp 2015-11-18 13:19:31.344034578 +0100
@@ -199,16 +199,6 @@
'_POSIX_C_SOURCE=200112',
'_XOPEN_SOURCE=600',
'PIC',
- # Disable deprecated features that generate spammy warnings.
- # BUILD.gn & media/ffmpeg/ffmpeg_common.h must be kept in sync.
- '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,
- # but the upstream code does not yet compile with it disabled.
- # (In this case, the fix is replacing the call with a new function.)
- # In the meantime, we directly disable those warnings in the C file.
- # 'FF_API_AVPACKET_OLD_API=0',
],
'variables': {
'clang_warning_flags': [