RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

revert r7181 

This was a stupid mistake. We already take care of time_scale
in av_set_pts_info().

Originally committed as revision 8333 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2007-03-11 23:19:27 +00:00
parent 6bed20f45a
commit 3d20538d07
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/matroska.c
View File

@ -2512,7 +2512,7 @@ matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, int size,
} }
if (cluster_time != (uint64_t)-1 && n == 0) { if (cluster_time != (uint64_t)-1 && n == 0) {
if (cluster_time + block_time >= 0) if (cluster_time + block_time >= 0)
timecode = (cluster_time + block_time) * matroska->time_scale; timecode = cluster_time + block_time;
} }
/* FIXME: duration */ /* FIXME: duration */