summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-11-10 21:28:47 +0100
committerwm4 <wm4@nowhere>2012-11-20 18:00:15 +0100
commitdcd2435e795eefe687c23b5b74da430525ad8c00 (patch)
treec34ee68325c662482341a9cf28605f067c5f6aae /video
parent2a353381f32c955eee0f2051d34375eba9459e6a (diff)
downloadmpv-dcd2435e795eefe687c23b5b74da430525ad8c00.tar.bz2
mpv-dcd2435e795eefe687c23b5b74da430525ad8c00.tar.xz
vf_softpulldown: fix possible regression
The lines added with this commit were accidentally removed in commit a0d759, which was a pure cleanup commit merged from mplayer-svn. The difference between mplayer-svn and the mplayer2 base is that this filter has been made PTS aware in mplayer2. Also remove the redundant initialization of vf->priv->state.
Diffstat (limited to 'video')
-rw-r--r--video/filter/vf_softpulldown.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/video/filter/vf_softpulldown.c b/video/filter/vf_softpulldown.c
index 80f353e548..a679ef9b44 100644
--- a/video/filter/vf_softpulldown.c
+++ b/video/filter/vf_softpulldown.c
@@ -168,7 +168,8 @@ static int vf_open(vf_instance_t *vf, char *args)
vf->uninit = uninit;
vf->default_reqs = VFCAP_ACCEPT_STRIDE;
vf->priv = calloc(1, sizeof(struct vf_priv_s));
- vf->priv->state = 0;
+ vf->priv->last_frame_duration = 2;
+ vf_detc_init_pts_buf(&vf->priv->ptsbuf);
return 1;
}