From: conrad <conrad@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Date: Wed, 5 Sep 2007 00:25:40 +0000 (+0000)
Subject: Make sure that the calculated duration doesn't decrease
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/frescor/ffmpeg.git/commitdiff_plain/2dd959e0e17e8c43c2be8e6aa9774cbd80672a5e

Make sure that the calculated duration doesn't decrease


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@10374 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
---

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index fcb3470d0..7fba6af3a 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -748,7 +748,7 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt)
         if (ret < 0) return ret;
     }
 
-    mkv->duration = pkt->pts + pkt->duration;
+    mkv->duration = FFMAX(mkv->duration, pkt->pts + pkt->duration);
     return 0;
 }