[SCM] libav/experimental: Make sure that the calculated duration doesn't decrease

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 7f8582dfc635334de7f6fc10c78d45a02dfd1104
Author: David Conrad <lessen42 at gmail.com>
Date:   Wed Sep 5 00:25:40 2007 +0000

    Make sure that the calculated duration doesn't decrease
    
    Originally committed as revision 10374 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index fcb3470..7fba6af 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;
 }
 

-- 
Libav/FFmpeg packaging