From 3d20538d070e04fb90524ab36e6c5cc18f099778 Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Sun, 11 Mar 2007 23:19:27 +0000 Subject: [PATCH] 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 --- libavformat/matroska.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 7b86bc670a..f01cfff126 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -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 */