[Ffmpeg-cvslog] CVS: ffmpeg/libavformat matroska.c,1.24,1.25

[Diego Biurrun CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv6297/libavformat

Modified Files:
	matroska.c 
Log Message:
Rename time variable to the more descriptive block_time.
patch by Steve Lhomme steve.....lhomme.. at ..free.....fr


Index: matroska.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/matroska.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- matroska.c	22 Mar 2006 11:11:02 -0000	1.24
+++ matroska.c	25 Mar 2006 13:37:34 -0000	1.25
@@ -2295,7 +2295,7 @@
             case MATROSKA_ID_BLOCK: {
                 uint8_t *data, *origdata;
                 int size;
-                uint64_t time;
+                uint64_t block_time;
                 uint32_t *lace_size = NULL;
                 int n, track, flags, laces = 0;
                 uint64_t num;
@@ -2328,8 +2328,8 @@
                     break;
                 }
 
-                /* time (relative to cluster time) */
-                time = ((data[0] << 8) | data[1]) * matroska->time_scale;
+                /* block_time (relative to cluster time) */
+                block_time = ((data[0] << 8) | data[1]) * matroska->time_scale;
                 data += 2;
                 size -= 2;
                 flags = *data;
@@ -2426,10 +2426,10 @@
                             break;
                         }
                         if (cluster_time != (uint64_t)-1) {
-                            if (time < 0 && (-time) > cluster_time)
+                            if (block_time < 0 && (-block_time) > cluster_time)
                                 timecode = cluster_time;
                             else
-                                timecode = cluster_time + time;
+                                timecode = cluster_time + block_time;
                         }
                         /* FIXME: duration */