diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2007-03-11 23:19:27 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2007-03-11 23:19:27 +0000 |
| commit | 3d20538d070e04fb90524ab36e6c5cc18f099778 (patch) | |
| tree | 17b2adcf471f8b91c1c94916de77fae7c49e5302 /libavformat | |
| parent | 6bed20f45a484f5709fec4c97a238240161b1797 (diff) | |
| download | ffmpeg-3d20538d070e04fb90524ab36e6c5cc18f099778.tar.gz | |
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
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 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 */ |