summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-12-19 17:39:58 +0100
committerwm4 <wm4@nowhere>2015-12-19 17:39:58 +0100
commit78bfee53dd32bdc70af9294b11a04722a42b10c2 (patch)
treee91af0d5a8c367517a084cecf2a4851317228b9f /video
parentcd24fdcd5a1acd8e6115814f5a0180224c1af7ed (diff)
downloadmpv-78bfee53dd32bdc70af9294b11a04722a42b10c2.tar.bz2
mpv-78bfee53dd32bdc70af9294b11a04722a42b10c2.tar.xz
vf: flush before reconfig
Diffstat (limited to 'video')
-rw-r--r--video/filter/vf.c2
-rw-r--r--video/filter/vf_buffer.c9
2 files changed, 1 insertions, 10 deletions
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;