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 fcb3470d03ebfac1554d48d96d0a7c22ae663e5b..7fba6af3aedb752bfce85c14b6ec1bc1f3278dbe 100644 (file)
--- 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;
 }