Commit f8f52f37 authored by aurel's avatar aurel

revert r7181

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


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@8333 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 12e93215
......@@ -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 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment