[SCM] libav/experimental: Rename time variable to the more descriptive block_time. patch by Steve Lhomme steve.....lhomme.. at ..free.....fr

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 662710ed3515252312e27273a97029e5d9af8420
Author: Steve L'Homme <slhomme at divxcorp.com>
Date:   Sat Mar 25 13:37:34 2006 +0000

    Rename time variable to the more descriptive block_time.
    patch by Steve Lhomme steve.....lhomme.. at ..free.....fr
    
    Originally committed as revision 5216 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index 4d6306e..afe161b 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -2295,7 +2295,7 @@ matroska_parse_blockgroup (MatroskaDemuxContext *matroska,
             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 @@ matroska_parse_blockgroup (MatroskaDemuxContext *matroska,
                     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 @@ matroska_parse_blockgroup (MatroskaDemuxContext *matroska,
                             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 */
 

-- 
Libav/FFmpeg packaging