Commit 2dd959e0 authored by conrad's avatar conrad

Make sure that the calculated duration doesn't decrease


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@10374 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent bfd7994a
......@@ -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;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment