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:
parent
6bed20f45a
commit
3d20538d07
@ -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 + block_time >= 0)
|
||||
timecode = (cluster_time + block_time) * matroska->time_scale;
|
||||
timecode = cluster_time + block_time;
|
||||
}
|
||||
/* FIXME: duration */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user