summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-05 22:56:43 +0100
committerwm4 <wm4@nowhere>2013-12-05 22:58:54 +0100
commit2d0a9c7af081f90d21cc811871bd67bbb6dcfd94 (patch)
tree24cadd837876bccd6c477a17dc81288671ed0392 /video
parent66e20ef8ad0c3e3ce420f08fa7849000a4cc060a (diff)
downloadmpv-2d0a9c7af081f90d21cc811871bd67bbb6dcfd94.tar.bz2
mpv-2d0a9c7af081f90d21cc811871bd67bbb6dcfd94.tar.xz
video/filter: remove unneeded config callbacks
They didn't do anything. vf_screenshot.c actually did release the previous image, but that's not really required. At worst you could take a screenshot and get an old frame when there's no new frame yet.
Diffstat (limited to 'video')
-rw-r--r--video/filter/vf_delogo.c8
-rw-r--r--video/filter/vf_flip.c12
-rw-r--r--video/filter/vf_noise.c8
-rw-r--r--video/filter/vf_screenshot.c9
-rw-r--r--video/filter/vf_softpulldown.c8
5 files changed, 0 insertions, 45 deletions
diff --git a/video/filter/vf_delogo.c b/video/filter/vf_delogo.c
index c8897f2a13..afee3119de 100644
--- a/video/filter/vf_delogo.c
+++ b/video/filter/vf_delogo.c
@@ -166,13 +166,6 @@ static void do_delogo(uint8_t *dst, uint8_t *src, int dstStride, int srcStride,
}
}
-static int config(struct vf_instance *vf,
- int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt){
-
- return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
-}
-
static struct mp_image *filter(struct vf_instance *vf, struct mp_image *mpi)
{
struct mp_image *dmpi = mpi;
@@ -282,7 +275,6 @@ load_error:
static int vf_open(vf_instance_t *vf){
struct vf_priv_s *p = vf->priv;
- vf->config=config;
vf->filter=filter;
vf->query_format=query_format;
diff --git a/video/filter/vf_flip.c b/video/filter/vf_flip.c
index b8d2159196..7c652e1138 100644
--- a/video/filter/vf_flip.c
+++ b/video/filter/vf_flip.c
@@ -28,15 +28,6 @@
#include "video/out/vo.h"
-//===========================================================================//
-
-static int config(struct vf_instance *vf, int width, int height,
- int d_width, int d_height,
- unsigned int flags, unsigned int outfmt)
-{
- return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
-}
-
static struct mp_image *filter(struct vf_instance *vf, struct mp_image *mpi)
{
mp_image_vflip(mpi);
@@ -51,7 +42,6 @@ static int query_format(struct vf_instance *vf, unsigned int fmt)
}
static int vf_open(vf_instance_t *vf){
- vf->config=config;
vf->filter=filter;
vf->query_format = query_format;
return 1;
@@ -62,5 +52,3 @@ const vf_info_t vf_info_flip = {
.name = "flip",
.open = vf_open,
};
-
-//===========================================================================//
diff --git a/video/filter/vf_noise.c b/video/filter/vf_noise.c
index d6a845c31f..3160907e19 100644
--- a/video/filter/vf_noise.c
+++ b/video/filter/vf_noise.c
@@ -324,13 +324,6 @@ static void donoise(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, in
if (fp->shiftptr == 3) fp->shiftptr = 0;
}
-static int config(struct vf_instance *vf,
- int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt){
-
- return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
-}
-
static struct mp_image *filter(struct vf_instance *vf, struct mp_image *mpi)
{
struct mp_image *dmpi = mpi;
@@ -393,7 +386,6 @@ static const unsigned int fmt_list[]={
};
static int vf_open(vf_instance_t *vf){
- vf->config=config;
vf->filter=filter;
vf->query_format=query_format;
vf->uninit=uninit;
diff --git a/video/filter/vf_screenshot.c b/video/filter/vf_screenshot.c
index 308c43c3b8..d0e98f07b8 100644
--- a/video/filter/vf_screenshot.c
+++ b/video/filter/vf_screenshot.c
@@ -36,14 +36,6 @@ struct vf_priv_s {
struct mp_image *current;
};
-static int config(struct vf_instance *vf,
- int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt)
-{
- mp_image_unrefp(&vf->priv->current);
- return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
-}
-
static struct mp_image *filter(struct vf_instance *vf, struct mp_image *mpi)
{
mp_image_unrefp(&vf->priv->current);
@@ -70,7 +62,6 @@ static int query_format(struct vf_instance *vf, unsigned int fmt)
static int vf_open(vf_instance_t *vf)
{
- vf->config = config;
vf->control = control;
vf->filter = filter;
vf->query_format = query_format;
diff --git a/video/filter/vf_softpulldown.c b/video/filter/vf_softpulldown.c
index 3f50de0991..4ad0e66552 100644
--- a/video/filter/vf_softpulldown.c
+++ b/video/filter/vf_softpulldown.c
@@ -116,13 +116,6 @@ static int filter(struct vf_instance *vf, struct mp_image *mpi)
return 0;
}
-static int config(struct vf_instance *vf,
- int width, int height, int d_width, int d_height,
- unsigned int flags, unsigned int outfmt)
-{
- return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
-}
-
static int control(vf_instance_t *vf, int request, void *data)
{
switch (request) {
@@ -151,7 +144,6 @@ static int query_format(struct vf_instance *vf, unsigned int fmt)
static int vf_open(vf_instance_t *vf)
{
- vf->config = config;
vf->filter_ext = filter;
vf->control = control;
vf->uninit = uninit;