summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-05 01:50:05 +0100
committerwm4 <wm4@nowhere>2013-12-05 01:50:05 +0100
commitf6e68b33bc2aaf67e125cf74fcb7538e89234a43 (patch)
tree8e88216dedb1ca13a906c72b6931aa0338de8f90 /video
parent84cfe0d8b24aaa104a4f607d3f1b0b32c225349b (diff)
downloadmpv-f6e68b33bc2aaf67e125cf74fcb7538e89234a43.tar.bz2
mpv-f6e68b33bc2aaf67e125cf74fcb7538e89234a43.tar.xz
video/filter: fix some bogus free() calls
The generic filter code frees these; recent regression.
Diffstat (limited to 'video')
-rw-r--r--video/filter/vf_noise.c3
-rw-r--r--video/filter/vf_phase.c1
-rw-r--r--video/filter/vf_pullup.c1
-rw-r--r--video/filter/vf_unsharp.c3
4 files changed, 0 insertions, 8 deletions
diff --git a/video/filter/vf_noise.c b/video/filter/vf_noise.c
index 51d10e2f8f..d6a845c31f 100644
--- a/video/filter/vf_noise.c
+++ b/video/filter/vf_noise.c
@@ -363,9 +363,6 @@ static void uninit(struct vf_instance *vf){
av_free(vf->priv->lumaParam.noise);
vf->priv->lumaParam.noise= NULL;
-
- free(vf->priv);
- vf->priv=NULL;
}
//===========================================================================//
diff --git a/video/filter/vf_phase.c b/video/filter/vf_phase.c
index 136f3cc187..c439a2466a 100644
--- a/video/filter/vf_phase.c
+++ b/video/filter/vf_phase.c
@@ -237,7 +237,6 @@ static void uninit(struct vf_instance *vf)
free(vf->priv->buf[0]);
free(vf->priv->buf[1]);
free(vf->priv->buf[2]);
- free(vf->priv);
}
static int query_format(struct vf_instance *vf, unsigned int fmt)
diff --git a/video/filter/vf_pullup.c b/video/filter/vf_pullup.c
index 910650d690..8745e61519 100644
--- a/video/filter/vf_pullup.c
+++ b/video/filter/vf_pullup.c
@@ -262,7 +262,6 @@ static int config(struct vf_instance *vf,
static void uninit(struct vf_instance *vf)
{
pullup_free_context(vf->priv->ctx);
- free(vf->priv);
}
static int control(vf_instance_t *vf, int request, void *data)
diff --git a/video/filter/vf_unsharp.c b/video/filter/vf_unsharp.c
index abb5fb4864..1f60adc230 100644
--- a/video/filter/vf_unsharp.c
+++ b/video/filter/vf_unsharp.c
@@ -201,9 +201,6 @@ static void uninit( struct vf_instance *vf ) {
av_free( fp->SC[z] );
fp->SC[z] = NULL;
}
-
- free( vf->priv );
- vf->priv = NULL;
}
//===========================================================================//