From 78bfee53dd32bdc70af9294b11a04722a42b10c2 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 19 Dec 2015 17:39:58 +0100 Subject: vf: flush before reconfig --- video/filter/vf.c | 2 +- video/filter/vf_buffer.c | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) (limited to 'video') diff --git a/video/filter/vf.c b/video/filter/vf.c index b16c0b3627..0898b62d17 100644 --- a/video/filter/vf.c +++ b/video/filter/vf.c @@ -609,7 +609,7 @@ int vf_reconfig(struct vf_chain *c, const struct mp_image_params *params, const struct mp_image_params *override_params) { int r = 0; - vf_chain_forget_frames(c); + vf_seek_reset(c); for (struct vf_instance *vf = c->first; vf; ) { struct vf_instance *next = vf->next; if (vf->autoinserted) diff --git a/video/filter/vf_buffer.c b/video/filter/vf_buffer.c index 2a7e458637..5a27c35796 100644 --- a/video/filter/vf_buffer.c +++ b/video/filter/vf_buffer.c @@ -27,14 +27,6 @@ static void flush(struct vf_instance *vf) vf->priv->num_queued = 0; } -static int config(struct vf_instance *vf, - int width, int height, int d_width, int d_height, - unsigned int flags, unsigned int outfmt) -{ - flush(vf); - return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); -} - static int filter_ext(struct vf_instance *vf, struct mp_image *mpi) { struct vf_priv_s *p = vf->priv; @@ -73,7 +65,6 @@ static void uninit(vf_instance_t *vf) static int vf_open(vf_instance_t *vf) { - vf->config = config; vf->filter_ext = filter_ext; vf->control = control; vf->uninit = uninit; -- cgit v1.2.3