diff options
author | wm4 <wm4@nowhere> | 2018-04-26 20:30:27 +0200 |
---|---|---|
committer | Jan Ekström <jeebjp@gmail.com> | 2018-04-29 02:21:32 +0300 |
commit | b4173c1fd2b732a2e1a69e3cf8f96bbe4ecc3ed5 (patch) | |
tree | f4d06e2b006587049185a80a0a6aeae054364d40 /video | |
parent | 67ce9813d69dfbad7faf5e3ec8dfab0ee5e5e388 (diff) | |
download | mpv-b4173c1fd2b732a2e1a69e3cf8f96bbe4ecc3ed5.tar.bz2 mpv-b4173c1fd2b732a2e1a69e3cf8f96bbe4ecc3ed5.tar.xz |
encode: do not clear video PTS on VOCTRL_RESET
This was supposed to be a replacement for encode_lavc_discontinuity()
(so we don't need to store last_video_in_pts in a way which requires
synchronization). Unfortunately, VOCTRL_RESET is also called before
termination, and even though it shouldn't matter as far as the VO API is
concerned, it does. It's because vo_lavc.c buffers a frame to compute
the frame duration.
Drop this code. The consequence is that it appears to encode 2 frames
with the same PTS if multiple files are encoded into one. Before this,
it merely dropped a frame (maybe the first of every subsequent file, not
sure).
Diffstat (limited to 'video')
-rw-r--r-- | video/out/vo_lavc.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/video/out/vo_lavc.c b/video/out/vo_lavc.c index c6d363eed7..3e0b338b68 100644 --- a/video/out/vo_lavc.c +++ b/video/out/vo_lavc.c @@ -384,14 +384,6 @@ static void flip_page(struct vo *vo) static int control(struct vo *vo, uint32_t request, void *data) { - struct priv *vc = vo->priv; - - switch (request) { - case VOCTRL_RESET: - vc->last_video_in_pts = MP_NOPTS_VALUE; - break; - } - return VO_NOTIMPL; } |