diff options
| author | wm4 <wm4@nowhere> | 2015-04-23 20:16:33 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-04-23 20:17:43 +0200 |
| commit | cc21eadf30aa3e822be25ffd5118d781f4409c86 (patch) | |
| tree | 6214f4f27211b165cb9ac32a44c2717af6725203 /demux | |
| parent | 90d7e51643273a14dfb9a4db622abb7da4e0aa5f (diff) | |
| download | mpv-cc21eadf30aa3e822be25ffd5118d781f4409c86.tar.bz2 mpv-cc21eadf30aa3e822be25ffd5118d781f4409c86.tar.xz | |
demux_mkv: limit timestamp fixing to 1ms max
And also fix the description. It didn't actually reflect what the code
did.
Diffstat (limited to 'demux')
| -rw-r--r-- | demux/demux_mkv.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |