From cc21eadf30aa3e822be25ffd5118d781f4409c86 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 23 Apr 2015 20:16:33 +0200 Subject: demux_mkv: limit timestamp fixing to 1ms max And also fix the description. It didn't actually reflect what the code did. --- demux/demux_mkv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'demux') diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index 39b271e1b6..b4ae042feb 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -2336,7 +2336,7 @@ static double fix_timestamp(demuxer_t *demuxer, mkv_track_t *track, double ts) mkv_demuxer_t *mkv_d = demuxer->priv; if (demuxer->opts->demux_mkv->fix_timestamps && track->default_duration > 0) { // Assume that timestamps have been rounded to the timecode scale. - double quant = mkv_d->tc_scale / 1e9; + double quant = MPMIN(mkv_d->tc_scale / 1e9, 0.001); double rts = rint(ts / track->default_duration) * track->default_duration; if (fabs(rts - ts) < quant) ts = rts; -- cgit v1.2.3