From 9c3e2f78a04200e604add6139ba6f64078fa2274 Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Fri, 10 Aug 2007 15:37:55 +0000 Subject: ensure that negative block_time are properly checked (workaround unsigned comparison) Originally committed as revision 10058 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/matroskadec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 5430821eb4..ace9917929 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2382,7 +2382,8 @@ matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, int size, int real_v = matroska->tracks[track]->flags & MATROSKA_TRACK_REAL_V; uint64_t timecode = AV_NOPTS_VALUE; - if (cluster_time != (uint64_t)-1 && cluster_time + block_time >= 0) + if (cluster_time != (uint64_t)-1 + && (block_time >= 0 || cluster_time >= -block_time)) timecode = cluster_time + block_time; for (n = 0; n < laces; n++) { -- cgit v1.2.3