mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

encode: do not clear video PTS on VOCTRL_RESET

Browse Source 
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).
This commit is contained in:
wm4 2018-04-26 20:30:27 +02:00 committed by Jan Ekström
parent 67ce9813d6
commit b4173c1fd2
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
video/out/vo_lavc.c
View File

@ -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;
}