videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-07-12 15:40:50 +02:00
Code Releases Activity

Rename time variable to the more descriptive block_time.

Browse Source 
patch by Steve Lhomme steve.....lhomme..@..free.....fr

Originally committed as revision 5216 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Steve L'Homme 2006-03-25 13:37:34 +00:00 committed by Diego Biurrun
parent 2ea392529a
commit 662710ed35
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/matroska.c
View File

@ -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 */