aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2015-12-17 20:51:42 +0100
committerStefano Sabatini <stefasab@gmail.com>2016-02-26 10:18:09 +0100
commitdedcb3c5a5e6beb2f2977e7cde307c8486078c2e (patch)
tree5facde0d635f1f001b05759ff1d973998fd84325
parent07eec5e721cc3657ac361b33f42c442769518b0d (diff)
downloadffmpeg-dedcb3c5a5e6beb2f2977e7cde307c8486078c2e.tar.gz
lavf/mux: do not fail in case of non strictly monotonically increasing DTS values for data packets
Consistent with what we already do with subtitles since ac08c5c0adcb7f2f9b5ea3eb473d1c2b9659aab2.
-rw-r--r--libavformat/mux.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c
index 789c811cd8..eb0b9739c2 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -554,6 +554,7 @@ static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket *
if (st->cur_dts && st->cur_dts != AV_NOPTS_VALUE &&
((!(s->oformat->flags & AVFMT_TS_NONSTRICT) &&
st->codec->codec_type != AVMEDIA_TYPE_SUBTITLE &&
+ st->codec->codec_type != AVMEDIA_TYPE_DATA &&
st->cur_dts >= pkt->dts) || st->cur_dts > pkt->dts)) {
av_log(s, AV_LOG_ERROR,
"Application provided invalid, non monotonically increasing dts to muxer in stream %d: %s >= %s\n",