Mercurial > libavformat.hg

changeset 1034:2a4d172f52df libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename time variable to the more descriptive block_time. patch by Steve Lhomme steve.....lhomme..@..free.....fr
author diego
date Sat, 25 Mar 2006 13:37:34 +0000
parents a757a0a3824f
children 4a33428641e1
files matroska.c
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/matroska.c	Fri Mar 24 17:03:49 2006 +0000
+++ b/matroska.c	Sat Mar 25 13:37:34 2006 +0000
@@ -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 */