[FFmpeg-cvslog] r10058 - trunk/libavformat/matroskadec.c

aurel subversion
Fri Aug 10 17:37:56 CEST 2007


Author: aurel
Date: Fri Aug 10 17:37:55 2007
New Revision: 10058

Log:
ensure that negative block_time are properly checked
(workaround unsigned comparison)


Modified:
   trunk/libavformat/matroskadec.c

Modified: trunk/libavformat/matroskadec.c
==============================================================================
--- trunk/libavformat/matroskadec.c	(original)
+++ trunk/libavformat/matroskadec.c	Fri Aug 10 17:37:55 2007
@@ -2382,7 +2382,8 @@ matroska_parse_block(MatroskaDemuxContex
         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++) {




More information about the ffmpeg-cvslog mailing list