]> git.sesse.net Git - ffmpeg/commitdiff
ffmpeg: Check dts before use in non monotone dts workaround
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 May 2013 12:54:13 +0000 (14:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 May 2013 12:55:20 +0000 (14:55 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c

index b890580febdbdba8d7fbcfc0f81e9d13364fbdcb..0e0d85d73749535d932b75d34e48346aba7038e4 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -612,6 +612,7 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
 
     if (!(s->oformat->flags & AVFMT_NOTIMESTAMPS) &&
         (avctx->codec_type == AVMEDIA_TYPE_AUDIO || avctx->codec_type == AVMEDIA_TYPE_VIDEO) &&
+        pkt->dts != AV_NOPTS_VALUE &&
         ost->last_mux_dts != AV_NOPTS_VALUE &&
         pkt->dts < ost->last_mux_dts + !(s->oformat->flags & AVFMT_TS_NONSTRICT)) {
         av_log(NULL, AV_LOG_WARNING, "Non-monotonous DTS in output stream "