[FFmpeg-cvslog] ffmpeg: Check dts before use in non monotone dts workaround

Michael Niedermayer git at videolan.org
Fri May 3 15:11:59 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May  3 14:54:13 2013 +0200| [6b2fbdb047dac1e3a6c6281226df2b76a3896dad] | committer: Michael Niedermayer

ffmpeg: Check dts before use in non monotone dts workaround

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6b2fbdb047dac1e3a6c6281226df2b76a3896dad
---

 ffmpeg.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/ffmpeg.c b/ffmpeg.c
index b890580..0e0d85d 100644
--- 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 "



More information about the ffmpeg-cvslog mailing list