[FFmpeg-cvslog] r10374 - trunk/libavformat/matroskaenc.c

[conrad]

Author: conrad
Date: Wed Sep  5 02:25:40 2007
New Revision: 10374

Log:
Make sure that the calculated duration doesn't decrease


Modified:
   trunk/libavformat/matroskaenc.c

Modified: trunk/libavformat/matroskaenc.c
==============================================================================
--- trunk/libavformat/matroskaenc.c	(original)
+++ trunk/libavformat/matroskaenc.c	Wed Sep  5 02:25:40 2007
@@ -748,7 +748,7 @@ static int mkv_write_packet(AVFormatCont
         if (ret < 0) return ret;
     }
 
-    mkv->duration = pkt->pts + pkt->duration;
+    mkv->duration = FFMAX(mkv->duration, pkt->pts + pkt->duration);
     return 0;
 }