From db51d3bbfdd63d4c62ca718bfcd7467d2cdc6fa6 Mon Sep 17 00:00:00 2001 From: Richard Date: Sun, 4 Sep 2016 11:27:10 +0100 Subject: Files not symlinks --- ...MPEG-libavformat-reduce-exits-on-subs-error.patch | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) mode change 120000 => 100644 FFMPEG patches/FFMPEG-libavformat-reduce-exits-on-subs-error.patch (limited to 'FFMPEG patches') diff --git a/FFMPEG patches/FFMPEG-libavformat-reduce-exits-on-subs-error.patch b/FFMPEG patches/FFMPEG-libavformat-reduce-exits-on-subs-error.patch deleted file mode 120000 index 00ad9f1..0000000 --- a/FFMPEG patches/FFMPEG-libavformat-reduce-exits-on-subs-error.patch +++ /dev/null @@ -1 +0,0 @@ -/opt/data/develop/FFmpeg-rf/FFMPEG-libavformat-reduce-exits-on-subs-error.patch \ No newline at end of file diff --git a/FFMPEG patches/FFMPEG-libavformat-reduce-exits-on-subs-error.patch b/FFMPEG patches/FFMPEG-libavformat-reduce-exits-on-subs-error.patch new file mode 100644 index 0000000..a6fd2f0 --- /dev/null +++ b/FFMPEG patches/FFMPEG-libavformat-reduce-exits-on-subs-error.patch @@ -0,0 +1,19 @@ +--- 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)); -- cgit v1.2.3