diff options
| author | wm4 <wm4@nowhere> | 2015-08-10 18:38:36 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-08-10 18:38:36 +0200 |
| commit | 8f2d9db79fc2f542b2973f245cc6b93fd35c1d80 (patch) | |
| tree | b5a31486e9c0aad9e284d0dfb38d463ecdc03bb0 | |
| parent | 5a52fe47a0e3fc4a84426eb7f705a50a44be9d98 (diff) | |
| download | mpv-8f2d9db79fc2f542b2973f245cc6b93fd35c1d80.tar.bz2 mpv-8f2d9db79fc2f542b2973f245cc6b93fd35c1d80.tar.xz | |
demux_mkv: disable timestamp fixup code again
This doesn't work too well if sections of the file change to a different
framerate. It lowers our chances to guess the correct FPS in the display
sync code.
For normal playback, this (probably) doesn't help that much anyway,
except that the "estimated-vf-fps" property will regress in the simplest
mkv case. This will be fixed with the next commit.
The now disabled code will probably be removed; it's not useful anymore.
| -rw-r--r-- | DOCS/man/options.rst | 2 | ||||
| -rw-r--r-- | demux/demux_mkv.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index a7783b965e..4e60e64c22 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -2179,7 +2179,7 @@ Demuxer as partial files). ``--demuxer-mkv-fix-timestamps=<yes|no>`` - Fix rounded Matroska timestamps (enabled by default). Matroska usually + Fix rounded Matroska timestamps (disabled by default). Matroska usually stores timestamps rounded to milliseconds. This means timestamps jitter by some amount around the intended timestamp. mpv can correct the timestamps based on the framerate value stored in the file: the timestamp is rounded diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index e8f0c596cd..d1271c2fdd 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -206,7 +206,7 @@ const struct m_sub_options demux_mkv_conf = { .size = sizeof(struct demux_mkv_opts), .defaults = &(const struct demux_mkv_opts){ .subtitle_preroll_secs = 1.0, - .fix_timestamps = 1, + .fix_timestamps = 0, }, }; |