From cb5b96cde0842a4a215a49b45ea74ae38a3f02f7 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Tue, 12 Aug 2008 17:26:36 +0000 Subject: [PATCH] Prevent dts generation code to be executed when delay is > MAX_REORDER_DELAY, this fixes overflow in AVStream->pts_buffer. Originally committed as revision 14714 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 0ed479886b..723427a6b4 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -895,7 +895,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, } } - if(pkt->pts != AV_NOPTS_VALUE){ + if(pkt->pts != AV_NOPTS_VALUE && delay <= MAX_REORDER_DELAY){ st->pts_buffer[0]= pkt->pts; for(i=1; ipts_buffer[i] == AV_NOPTS_VALUE; i++) st->pts_buffer[i]= (i-delay-1) * pkt->duration; @@ -2524,7 +2524,7 @@ static int compute_pkt_fields2(AVStream *st, AVPacket *pkt){ } //calculate dts from pts - if(pkt->pts != AV_NOPTS_VALUE && pkt->dts == AV_NOPTS_VALUE){ + if(pkt->pts != AV_NOPTS_VALUE && pkt->dts == AV_NOPTS_VALUE && delay <= MAX_REORDER_DELAY){ st->pts_buffer[0]= pkt->pts; for(i=1; ipts_buffer[i] == AV_NOPTS_VALUE; i++) st->pts_buffer[i]= (i-delay-1) * pkt->duration;