summaryrefslogtreecommitdiff
path: root/FFMPEG patches
diff options
context:
space:
mode:
Diffstat (limited to 'FFMPEG patches')
-rw-r--r--[l---------]FFMPEG patches/FFMPEG-libavformat-reduce-exits-on-subs-error.patch20
1 files changed, 19 insertions, 1 deletions
diff --git a/FFMPEG patches/FFMPEG-libavformat-reduce-exits-on-subs-error.patch b/FFMPEG patches/FFMPEG-libavformat-reduce-exits-on-subs-error.patch
index 00ad9f1..a6fd2f0 120000..100644
--- a/FFMPEG patches/FFMPEG-libavformat-reduce-exits-on-subs-error.patch
+++ b/FFMPEG patches/FFMPEG-libavformat-reduce-exits-on-subs-error.patch
@@ -1 +1,19 @@
-/opt/data/develop/FFmpeg-rf/FFMPEG-libavformat-reduce-exits-on-subs-error.patch \ No newline at end of file
+--- mux.c 2016-09-01 14:21:01.254840644 +0100
++++ new/mux.c 2016-09-01 14:18:01.000000000 +0100
+@@ -597,11 +597,11 @@
+ pkt->dts = st->pts_buffer[0];
+ }
+
+- if (st->cur_dts && st->cur_dts != AV_NOPTS_VALUE &&
+- ((!(s->oformat->flags & AVFMT_TS_NONSTRICT) &&
+- st->codecpar->codec_type != AVMEDIA_TYPE_SUBTITLE &&
+- st->codecpar->codec_type != AVMEDIA_TYPE_DATA &&
+- st->cur_dts >= pkt->dts) || st->cur_dts > pkt->dts)) {
++// RF This patch helps prevent ffmpeg exiting unecessarily due to DTS issues in subtitles.
++// My idea is that DTS issues don't matter for subs, they only use PTS. In any case timing not mega critical.
++
++// if (st->cur_dts && st->cur_dts != AV_NOPTS_VALUE && ((!(s->oformat->flags & AVFMT_TS_NONSTRICT) && st->codecpar->codec_type != AVMEDIA_TYPE_SUBTITLE && st->codecpar->codec_type != AVMEDIA_TYPE_DATA && st->cur_dts >= pkt->dts) || st->cur_dts > pkt->dts)) {
++ if (st->cur_dts && st->cur_dts != AV_NOPTS_VALUE && ((!(s->oformat->flags & AVFMT_TS_NONSTRICT) && st->codecpar->codec_type != AVMEDIA_TYPE_SUBTITLE && st->codecpar->codec_type != AVMEDIA_TYPE_DATA && st->cur_dts >= pkt->dts) || (st->cur_dts > pkt->dts && st->codecpar->codec_type != AVMEDIA_TYPE_SUBTITLE && st->codecpar->codec_type != AVMEDIA_TYPE_DATA))) {
+ av_log(s, AV_LOG_ERROR,
+ "Application provided invalid, non monotonically increasing dts to muxer in stream %d: %s >= %s\n",
+ st->index, av_ts2str(st->cur_dts), av_ts2str(pkt->dts));