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

diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index 7b86bc6..f01cfff 100644 (file)
--- 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 */