diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2006-11-28 23:41:53 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2006-11-28 23:41:53 +0000 |
| commit | be691b106048fdf118df248458d80a4d36fded2a (patch) | |
| tree | cc4d0eb5cf5e9cc8a7fb5fb0570a616389e8cbda /libavformat | |
| parent | 7f25df4cd38fe9de6dd88f806a3994be5302a823 (diff) | |
| download | ffmpeg-streaming-be691b106048fdf118df248458d80a4d36fded2a.zip ffmpeg-streaming-be691b106048fdf118df248458d80a4d36fded2a.tar.gz | |
matroska: scale timecode according to time_scale
fixes jerky playback of planet.earth.mkv
Originally committed as revision 7181 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/matroska.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 582d7d8..0cd119e 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -2536,7 +2536,7 @@ matroska_parse_blockgroup (MatroskaDemuxContext *matroska, } if (cluster_time != (uint64_t)-1 && n == 0) { if (cluster_time + block_time >= 0) - timecode = cluster_time + block_time; + timecode = (cluster_time + block_time) * matroska->time_scale; } /* FIXME: duration */ |
