From 0e757bf9daa55db9fa7052efe5aef09f90044054 Mon Sep 17 00:00:00 2001
From: Uoti Urpala <uau@symbol.nonexistent.invalid>
Date: Thu, 24 Apr 2008 05:49:44 +0300
Subject: Remove _s/_st suffix from some struct names

Since the names are always used after the keyword "struct" having a
suffix as in "struct demuxer_st" is almost completely pointless.
---
 DOCS/tech/libmpcodecs.txt     | 20 ++++++++++----------
 codec-cfg.h                   |  2 +-
 libaf/af.h                    |  2 +-
 libao2/audio_out.h            |  3 +--
 libmenu/vf_menu.c             | 12 ++++++------
 libmpcodecs/ad.h              |  2 +-
 libmpcodecs/mp_image.h        |  2 +-
 libmpcodecs/vd.c              |  2 +-
 libmpcodecs/vd.h              |  2 +-
 libmpcodecs/ve_lavc.c         | 14 +++++++-------
 libmpcodecs/ve_libdv.c        |  8 ++++----
 libmpcodecs/ve_nuv.c          | 10 +++++-----
 libmpcodecs/ve_qtvideo.c      |  8 ++++----
 libmpcodecs/ve_raw.c          | 10 +++++-----
 libmpcodecs/ve_vfw.c          | 10 +++++-----
 libmpcodecs/ve_x264.c         | 16 ++++++++--------
 libmpcodecs/ve_xvid4.c        | 10 +++++-----
 libmpcodecs/vf.c              | 14 +++++++-------
 libmpcodecs/vf.h              | 38 +++++++++++++++++++-------------------
 libmpcodecs/vf_1bpp.c         |  8 ++++----
 libmpcodecs/vf_2xsai.c        |  6 +++---
 libmpcodecs/vf_ass.c          | 20 ++++++++++----------
 libmpcodecs/vf_blackframe.c   | 10 +++++-----
 libmpcodecs/vf_bmovl.c        |  8 ++++----
 libmpcodecs/vf_boxblur.c      |  6 +++---
 libmpcodecs/vf_crop.c         |  8 ++++----
 libmpcodecs/vf_cropdetect.c   |  6 +++---
 libmpcodecs/vf_decimate.c     |  4 ++--
 libmpcodecs/vf_delogo.c       | 10 +++++-----
 libmpcodecs/vf_denoise3d.c    |  8 ++++----
 libmpcodecs/vf_detc.c         | 10 +++++-----
 libmpcodecs/vf_dint.c         |  4 ++--
 libmpcodecs/vf_divtc.c        |  6 +++---
 libmpcodecs/vf_down3dright.c  |  8 ++++----
 libmpcodecs/vf_dsize.c        |  2 +-
 libmpcodecs/vf_dvbscale.c     |  2 +-
 libmpcodecs/vf_eq.c           |  8 ++++----
 libmpcodecs/vf_expand.c       | 22 +++++++++++-----------
 libmpcodecs/vf_field.c        |  6 +++---
 libmpcodecs/vf_fil.c          |  6 +++---
 libmpcodecs/vf_filmdint.c     | 10 +++++-----
 libmpcodecs/vf_flip.c         |  6 +++---
 libmpcodecs/vf_format.c       |  2 +-
 libmpcodecs/vf_framestep.c    |  4 ++--
 libmpcodecs/vf_fspp.c         | 12 ++++++------
 libmpcodecs/vf_geq.c          | 14 +++++++-------
 libmpcodecs/vf_halfpack.c     |  8 ++++----
 libmpcodecs/vf_harddup.c      |  6 +++---
 libmpcodecs/vf_hqdn3d.c       |  8 ++++----
 libmpcodecs/vf_hue.c          |  8 ++++----
 libmpcodecs/vf_il.c           |  2 +-
 libmpcodecs/vf_ilpack.c       |  6 +++---
 libmpcodecs/vf_ivtc.c         |  8 ++++----
 libmpcodecs/vf_kerndeint.c    | 10 +++++-----
 libmpcodecs/vf_lavc.c         |  6 +++---
 libmpcodecs/vf_lavcdeint.c    |  6 +++---
 libmpcodecs/vf_mcdeint.c      | 10 +++++-----
 libmpcodecs/vf_mirror.c       |  2 +-
 libmpcodecs/vf_noformat.c     |  2 +-
 libmpcodecs/vf_noise.c        | 10 +++++-----
 libmpcodecs/vf_ow.c           | 10 +++++-----
 libmpcodecs/vf_palette.c      |  8 ++++----
 libmpcodecs/vf_perspective.c  |  8 ++++----
 libmpcodecs/vf_phase.c        |  4 ++--
 libmpcodecs/vf_pp.c           | 12 ++++++------
 libmpcodecs/vf_pp7.c          | 12 ++++++------
 libmpcodecs/vf_pullup.c       | 12 ++++++------
 libmpcodecs/vf_qp.c           |  8 ++++----
 libmpcodecs/vf_rectangle.c    |  6 +++---
 libmpcodecs/vf_remove_logo.c  |  8 ++++----
 libmpcodecs/vf_rgb2bgr.c      |  6 +++---
 libmpcodecs/vf_rgbtest.c      |  6 +++---
 libmpcodecs/vf_rotate.c       |  6 +++---
 libmpcodecs/vf_sab.c          |  8 ++++----
 libmpcodecs/vf_scale.c        | 14 +++++++-------
 libmpcodecs/vf_screenshot.c   | 12 ++++++------
 libmpcodecs/vf_smartblur.c    |  8 ++++----
 libmpcodecs/vf_softpulldown.c |  6 +++---
 libmpcodecs/vf_softskip.c     |  8 ++++----
 libmpcodecs/vf_spp.c          | 12 ++++++------
 libmpcodecs/vf_swapuv.c       |  6 +++---
 libmpcodecs/vf_telecine.c     |  8 ++++----
 libmpcodecs/vf_test.c         |  6 +++---
 libmpcodecs/vf_tfields.c      | 12 ++++++------
 libmpcodecs/vf_tile.c         |  8 ++++----
 libmpcodecs/vf_tinterlace.c   |  8 ++++----
 libmpcodecs/vf_unsharp.c      | 10 +++++-----
 libmpcodecs/vf_uspp.c         | 12 ++++++------
 libmpcodecs/vf_vo.c           | 18 +++++++++---------
 libmpcodecs/vf_yadif.c        | 14 +++++++-------
 libmpcodecs/vf_yuvcsp.c       |  8 ++++----
 libmpcodecs/vf_yuy2.c         |  6 +++---
 libmpcodecs/vf_yvu9.c         |  6 +++---
 libmpcodecs/vf_zrmjpeg.c      |  6 +++---
 libmpdemux/demux_nemesi.c     |  2 +-
 libmpdemux/demuxer.c          |  2 +-
 libmpdemux/demuxer.h          | 34 +++++++++++++++++-----------------
 libmpdemux/stheader.h         | 10 +++++-----
 mp_core.h                     | 10 +++++-----
 mplayer.c                     |  2 +-
 playtree.h                    |  4 ++--
 playtreeparser.h              |  6 +++---
 stream/stream.h               | 16 ++++++++--------
 stream/stream_netstream.c     |  6 +++---
 stream/stream_radio.c         | 18 +++++++++---------
 stream/stream_radio.h         | 12 ++++++------
 stream/stream_rtsp.c          |  2 +-
 stream/stream_vstream.c       |  4 ++--
 subreader.h                   |  6 +++---
 109 files changed, 464 insertions(+), 465 deletions(-)

diff --git a/DOCS/tech/libmpcodecs.txt b/DOCS/tech/libmpcodecs.txt
index 65165b7bd9..dcd70dc38b 100644
--- a/DOCS/tech/libmpcodecs.txt
+++ b/DOCS/tech/libmpcodecs.txt
@@ -151,7 +151,7 @@ vf_info_t* info;
     const char *name;    // short name of the filter, must be FILTERNAME
     const char *author;  // name and email/url of the author(s)
     const char *comment; // comment, url to papers describing algo etc.
-    int (*open)(struct vf_instance_s* vf,char* args);
+    int (*open)(struct vf_instance* vf,char* args);
                          // pointer to the open() function:
 
 Sample:
@@ -200,7 +200,7 @@ NOTE: All these are optional, their function pointer is either NULL or points
 to a default implementation. If you implement them, don't forget to set
 vf->FUNCNAME in your open() !
 
-    int (*query_format)(struct vf_instance_s* vf,
+    int (*query_format)(struct vf_instance* vf,
         unsigned int fmt);
 
 The query_format() function is called one or more times before the config(),
@@ -214,7 +214,7 @@ next filter will accept at least one of your possible output colorspaces!
 
 Sample:
 
-static int query_format(struct vf_instance_s* vf, unsigned int fmt){
+static int query_format(struct vf_instance* vf, unsigned int fmt){
     switch(fmt){
     case IMGFMT_YV12:
     case IMGFMT_I420:
@@ -229,7 +229,7 @@ For the more complex case, when you have an N->M colorspace mapping matrix,
 see vf_scale or vf_rgb2bgr for examples.
 
 
-    int (*config)(struct vf_instance_s* vf,
+    int (*config)(struct vf_instance* vf,
         int width, int height, int d_width, int d_height,
         unsigned int flags, unsigned int outfmt);
 
@@ -254,7 +254,7 @@ Its parameters are already well-known from libvo:
 
 Sample:
 
-static int config(struct vf_instance_s* vf,
+static int config(struct vf_instance* vf,
         int width, int height, int d_width, int d_height,
         unsigned int flags, unsigned int outfmt){
     // use d_width/d_height if not set by user:
@@ -266,12 +266,12 @@ static int config(struct vf_instance_s* vf,
     return vf_next_config(vf,vf->priv->w,vf->priv->h,d_width,d_height,flags,outfmt);
 }
 
-    void (*uninit)(struct vf_instance_s* vf);
+    void (*uninit)(struct vf_instance* vf);
 
 Okey, uninit() is the simplest, it's called at the end. You can free your
 private buffers etc here.
 
-    int (*put_image)(struct vf_instance_s* vf,
+    int (*put_image)(struct vf_instance* vf,
         mp_image_t *mpi);
 
 Ah, put_image(). This is the main filter function, it should convert/filter/
@@ -328,7 +328,7 @@ image:
 
 Ok, the rest is for advanced functionality only:
 
-    int (*control)(struct vf_instance_s* vf,
+    int (*control)(struct vf_instance* vf,
         int request, void* data);
 
 You can control the filter at runtime from MPlayer/MEncoder/dec_video:
@@ -340,7 +340,7 @@ You can control the filter at runtime from MPlayer/MEncoder/dec_video:
 #define VFCTRL_CHANGE_RECTANGLE 9 /* Change the rectangle boundaries */
 
 
-    void (*get_image)(struct vf_instance_s* vf,
+    void (*get_image)(struct vf_instance* vf,
         mp_image_t *mpi);
 
 This is for direct rendering support, works the same way as in libvo drivers.
@@ -357,7 +357,7 @@ order, while put_image is called for display) so the only safe place to save
 it is in the mpi struct itself: mpi->priv=(void*)dmpi;
 
 
-    void (*draw_slice)(struct vf_instance_s* vf,
+    void (*draw_slice)(struct vf_instance* vf,
         unsigned char** src, int* stride, int w,int h, int x, int y);
 
 It's the good old draw_slice callback, already known from libvo.
diff --git a/codec-cfg.h b/codec-cfg.h
index dca75c3bbf..982f37752e 100644
--- a/codec-cfg.h
+++ b/codec-cfg.h
@@ -38,7 +38,7 @@ typedef struct {
 #endif
 
 
-typedef struct codecs_st {
+typedef struct codecs {
 	unsigned int fourcc[CODECS_MAX_FOURCC];
 	unsigned int fourccmap[CODECS_MAX_FOURCC];
 	unsigned int outfmt[CODECS_MAX_OUTFMT];
diff --git a/libaf/af.h b/libaf/af.h
index dfa9cfdea5..8404e24848 100644
--- a/libaf/af.h
+++ b/libaf/af.h
@@ -90,7 +90,7 @@ typedef struct af_cfg_s{
 }af_cfg_t;
 
 // Current audio stream
-typedef struct af_stream_s
+typedef struct af_stream
 {
   // The first and last filter in the list
   af_instance_t* first;
diff --git a/libao2/audio_out.h b/libao2/audio_out.h
index 5fad397313..59811f2754 100644
--- a/libao2/audio_out.h
+++ b/libao2/audio_out.h
@@ -29,8 +29,7 @@ typedef struct ao_functions_s
 } ao_functions_t;
 
 /* global data used by mplayer and plugins */
-typedef struct ao_data_s
-{
+typedef struct ao_data {
   int samplerate;
   int channels;
   int format;
diff --git a/libmenu/vf_menu.c b/libmenu/vf_menu.c
index ea63527951..2cd68f3205 100644
--- a/libmenu/vf_menu.c
+++ b/libmenu/vf_menu.c
@@ -41,9 +41,9 @@ struct vf_priv_s {
   int passthrough;
 };
 
-static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts);
+static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts);
 
-void vf_menu_pause_update(struct vf_instance_s* vf) {
+void vf_menu_pause_update(struct vf_instance* vf) {
   const struct vo *video_out = mpctx_get_video_out(vf->priv->current->ctx);
   if(pause_mpi) {
     put_image(vf,pause_mpi, MP_NOPTS_VALUE);
@@ -107,7 +107,7 @@ static int cmd_filter(mp_cmd_t* cmd, int paused, struct vf_priv_s * priv) {
   return 0;
 }
 
-static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static void get_image(struct vf_instance* vf, mp_image_t *mpi){
   mp_image_t *dmpi;
 
   if(mpi->type == MP_IMGTYPE_TEMP && (!(mpi->flags&MP_IMGFLAG_PRESERVE)) ) {
@@ -124,7 +124,7 @@ static int key_cb(int code) {
   return menu_read_key(st_priv->current,code);
 }
 
-static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
+static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){
   mp_image_t *dmpi = NULL;
 
   if (vf->priv->passthrough) {
@@ -200,7 +200,7 @@ static void uninit(vf_instance_t *vf) {
      }
 }
 
-static int config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height,
+static int config(struct vf_instance* vf, int width, int height, int d_width, int d_height,
 		  unsigned int flags, unsigned int outfmt) { 
 #ifdef HAVE_FREETYPE    
   // here is the right place to get screen dimensions
@@ -214,7 +214,7 @@ static int config(struct vf_instance_s* vf, int width, int height, int d_width,
   return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
 }
 
-static int query_format(struct vf_instance_s* vf, unsigned int fmt){
+static int query_format(struct vf_instance* vf, unsigned int fmt){
   return (vf_next_query_format(vf,fmt));
 }
 
diff --git a/libmpcodecs/ad.h b/libmpcodecs/ad.h
index 6f1d5e7566..8063ea994e 100644
--- a/libmpcodecs/ad.h
+++ b/libmpcodecs/ad.h
@@ -7,7 +7,7 @@
 typedef mp_codec_info_t ad_info_t;
 
 /* interface of video decoder drivers */
-typedef struct ad_functions_s
+typedef struct ad_functions
 {
 	ad_info_t *info;
         int (*preinit)(sh_audio_t *sh);
diff --git a/libmpcodecs/mp_image.h b/libmpcodecs/mp_image.h
index 512f83e8c5..364c7937ab 100644
--- a/libmpcodecs/mp_image.h
+++ b/libmpcodecs/mp_image.h
@@ -75,7 +75,7 @@
 #define MP_IMGFIELD_BOTTOM 0x10
 #define MP_IMGFIELD_INTERLACED 0x20
 
-typedef struct mp_image_s {
+typedef struct mp_image {
     unsigned short flags;
     unsigned char type;
     unsigned char bpp;  // bits/pixel. NOT depth! for RGB it will be n*8
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c
index 0e4de62ca4..7fb6af600f 100644
--- a/libmpcodecs/vd.c
+++ b/libmpcodecs/vd.c
@@ -344,7 +344,7 @@ mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, i
 }
 
 void mpcodecs_draw_slice(sh_video_t *sh, unsigned char** src, int* stride, int w,int h, int x, int y) {
-  struct vf_instance_s* vf = sh->vfilter;
+  struct vf_instance* vf = sh->vfilter;
 
   if(vf->draw_slice)
     vf->draw_slice(vf,src,stride,w,h,x,y);
diff --git a/libmpcodecs/vd.h b/libmpcodecs/vd.h
index a3d77339c4..1b6a5ba208 100644
--- a/libmpcodecs/vd.h
+++ b/libmpcodecs/vd.h
@@ -8,7 +8,7 @@
 typedef mp_codec_info_t vd_info_t;
 
 /* interface of video decoder drivers */
-typedef struct vd_functions_s
+typedef struct vd_functions
 {
 	vd_info_t *info;
         int (*init)(sh_video_t *sh);
diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c
index df06bfb81c..40d50e37eb 100644
--- a/libmpcodecs/ve_lavc.c
+++ b/libmpcodecs/ve_lavc.c
@@ -318,9 +318,9 @@ struct vf_priv_s {
 #define mux_v (vf->priv->mux)
 #define lavc_venc_context (vf->priv->context)
 
-static int encode_frame(struct vf_instance_s* vf, AVFrame *pic, double pts);
+static int encode_frame(struct vf_instance* vf, AVFrame *pic, double pts);
 
-static int config(struct vf_instance_s* vf,
+static int config(struct vf_instance* vf,
         int width, int height, int d_width, int d_height,
 	unsigned int flags, unsigned int outfmt){
     int size, i;
@@ -703,7 +703,7 @@ static int config(struct vf_instance_s* vf,
     return 1;
 }
 
-static int control(struct vf_instance_s* vf, int request, void* data){
+static int control(struct vf_instance* vf, int request, void* data){
 
     switch(request){
         case VFCTRL_FLUSH_FRAMES:
@@ -715,7 +715,7 @@ static int control(struct vf_instance_s* vf, int request, void* data){
     }
 }
 
-static int query_format(struct vf_instance_s* vf, unsigned int fmt){
+static int query_format(struct vf_instance* vf, unsigned int fmt){
     switch(fmt){
     case IMGFMT_YV12:
     case IMGFMT_IYUV:
@@ -752,7 +752,7 @@ static double psnr(double d){
     return -10.0*log(d)/log(10);
 }
 
-static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
+static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){
     AVFrame *pic= vf->priv->pic;
 
     pic->data[0]=mpi->planes[0];
@@ -775,7 +775,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
     return (encode_frame(vf, pic, pts) >= 0);
 }
 
-static int encode_frame(struct vf_instance_s* vf, AVFrame *pic, double pts){
+static int encode_frame(struct vf_instance* vf, AVFrame *pic, double pts){
     const char pict_type_char[5]= {'?', 'I', 'P', 'B', 'S'};
     int out_size;
     double dts;
@@ -880,7 +880,7 @@ static int encode_frame(struct vf_instance_s* vf, AVFrame *pic, double pts){
     return out_size;
 }
 
-static void uninit(struct vf_instance_s* vf){
+static void uninit(struct vf_instance* vf){
 
     if(lavc_param_psnr){
         double f= lavc_venc_context->width*lavc_venc_context->height*255.0*255.0;
diff --git a/libmpcodecs/ve_libdv.c b/libmpcodecs/ve_libdv.c
index fab9628d3c..da0f261d58 100644
--- a/libmpcodecs/ve_libdv.c
+++ b/libmpcodecs/ve_libdv.c
@@ -37,7 +37,7 @@ struct vf_priv_s {
 
 //===========================================================================//
 
-static int config(struct vf_instance_s* vf,
+static int config(struct vf_instance* vf,
         int width, int height, int d_width, int d_height,
 	unsigned int flags, unsigned int outfmt){
 
@@ -59,18 +59,18 @@ static int config(struct vf_instance_s* vf,
     return 1;
 }
 
-static int control(struct vf_instance_s* vf, int request, void* data){
+static int control(struct vf_instance* vf, int request, void* data){
 
     return CONTROL_UNKNOWN;
 }
 
-static int query_format(struct vf_instance_s* vf, unsigned int fmt){
+static int query_format(struct vf_instance* vf, unsigned int fmt){
     if(fmt==IMGFMT_YUY2) return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW;
     if(fmt==IMGFMT_RGB24) return VFCAP_CSP_SUPPORTED;
     return 0;
 }
 
-static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
+static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){
 
     dv_encode_full_frame(vf->priv->enc, mpi->planes, 
 	(mpi->flags&MP_IMGFLAG_YUV) ? e_dv_color_yuv : e_dv_color_rgb,
diff --git a/libmpcodecs/ve_nuv.c b/libmpcodecs/ve_nuv.c
index 0b670179cd..91473627da 100644
--- a/libmpcodecs/ve_nuv.c
+++ b/libmpcodecs/ve_nuv.c
@@ -68,7 +68,7 @@ m_option_t nuvopts_conf[]={
 //===========================================================================//
 
 
-static int config(struct vf_instance_s* vf,
+static int config(struct vf_instance* vf,
         int width, int height, int d_width, int d_height,
 	unsigned int flags, unsigned int outfmt){
 
@@ -88,17 +88,17 @@ static int config(struct vf_instance_s* vf,
   return 1;
 }
 
-static int control(struct vf_instance_s* vf, int request, void* data){
+static int control(struct vf_instance* vf, int request, void* data){
 
   return CONTROL_UNKNOWN;
 }
 
-static int query_format(struct vf_instance_s* vf, unsigned int fmt){
+static int query_format(struct vf_instance* vf, unsigned int fmt){
   if(fmt==IMGFMT_I420) return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW;
   return 0;
 }
 
-static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
+static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){
   struct rtframeheader* ench = (struct rtframeheader*)vf->priv->buffer;
   uint8_t* data = vf->priv->buffer + FRAMEHEADERSIZE;
   uint8_t* zdata = vf->priv->zbuffer + FRAMEHEADERSIZE;
@@ -180,7 +180,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
   return 1;
 }
 
-static void uninit(struct vf_instance_s* vf) {
+static void uninit(struct vf_instance* vf) {
 
   if(vf->priv->buffer)
     free(vf->priv->buffer);
diff --git a/libmpcodecs/ve_qtvideo.c b/libmpcodecs/ve_qtvideo.c
index f7168f2b76..25a2cb19f7 100644
--- a/libmpcodecs/ve_qtvideo.c
+++ b/libmpcodecs/ve_qtvideo.c
@@ -121,7 +121,7 @@ struct vf_priv_s {
 
 //===========================================================================//
 
-static int config(struct vf_instance_s* vf,
+static int config(struct vf_instance* vf,
         int width, int height, int d_width, int d_height,
 	unsigned int flags, unsigned int outfmt){
 //    OSErr cres;
@@ -159,19 +159,19 @@ static int config(struct vf_instance_s* vf,
     return 1;
 }
 
-static int control(struct vf_instance_s* vf, int request, void* data){
+static int control(struct vf_instance* vf, int request, void* data){
 
     return CONTROL_UNKNOWN;
 }
 
-static int query_format(struct vf_instance_s* vf, unsigned int fmt){
+static int query_format(struct vf_instance* vf, unsigned int fmt){
     if(fmt==IMGFMT_YUY2) return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW;
     return 0;
 }
 
 static int codec_initialized = 0;
 
-static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
+static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){
 
     OSErr cres;
     long framesizemax;
diff --git a/libmpcodecs/ve_raw.c b/libmpcodecs/ve_raw.c
index 691d1c11d5..d0f54df81b 100644
--- a/libmpcodecs/ve_raw.c
+++ b/libmpcodecs/ve_raw.c
@@ -26,7 +26,7 @@ struct vf_priv_s {
 };
 #define mux_v (vf->priv->mux)
 
-static int set_format(struct vf_instance_s *vf, unsigned int fmt) {
+static int set_format(struct vf_instance *vf, unsigned int fmt) {
     mux_v->bih->biCompression = fmt;
     
     mux_v->bih->biPlanes = 1;
@@ -81,7 +81,7 @@ static int set_format(struct vf_instance_s *vf, unsigned int fmt) {
 }
 
 
-static int config(struct vf_instance_s *vf,
+static int config(struct vf_instance *vf,
         int width, int height, int d_width, int d_height,
 	unsigned int flags, unsigned int outfmt)
 {
@@ -96,11 +96,11 @@ static int config(struct vf_instance_s *vf,
     return 1;
 }
 
-static int control(struct vf_instance_s *vf, int request, void *data) {
+static int control(struct vf_instance *vf, int request, void *data) {
     return CONTROL_UNKNOWN;
 }
 
-static int query_format(struct vf_instance_s *vf, unsigned int fmt) {
+static int query_format(struct vf_instance *vf, unsigned int fmt) {
     if (IMGFMT_IS_RGB(fmt) || IMGFMT_IS_BGR(fmt))
 	return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW;
     switch (fmt) {
@@ -121,7 +121,7 @@ static int query_format(struct vf_instance_s *vf, unsigned int fmt) {
     return 0;
 }
 
-static int put_image(struct vf_instance_s *vf, mp_image_t *mpi, double pts) {
+static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) {
     mux_v->buffer = mpi->planes[0];
     muxer_write_chunk(mux_v, mpi->width*mpi->height*mux_v->bih->biBitCount/8, 0x10, pts, pts);
     return 1;
diff --git a/libmpcodecs/ve_vfw.c b/libmpcodecs/ve_vfw.c
index d9425601bd..ddceb428a2 100644
--- a/libmpcodecs/ve_vfw.c
+++ b/libmpcodecs/ve_vfw.c
@@ -259,7 +259,7 @@ static int vfw_encode_frame(BITMAPINFOHEADER* biOutput,void* OutBuf,
 #define mux_v (vf->priv->mux)
 #define vfw_bih (vf->priv->bih)
 
-static int config(struct vf_instance_s* vf,
+static int config(struct vf_instance* vf,
         int width, int height, int d_width, int d_height,
 	unsigned int flags, unsigned int outfmt){
 
@@ -277,17 +277,17 @@ static int config(struct vf_instance_s* vf,
     return 1;
 }
 
-static int control(struct vf_instance_s* vf, int request, void* data){
+static int control(struct vf_instance* vf, int request, void* data){
 
     return CONTROL_UNKNOWN;
 }
 
-static int query_format(struct vf_instance_s* vf, unsigned int fmt){
+static int query_format(struct vf_instance* vf, unsigned int fmt){
     if(fmt==IMGFMT_BGR24) return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_FLIPPED;
     return 0;
 }
 
-static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
+static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){
     long flags=0;
     int ret;
 //    flip_upside_down(vo_image_ptr,vo_image_ptr,3*vo_w,vo_h); // dirty hack
@@ -298,7 +298,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
     return 1;
 }
 
-static void uninit(struct vf_instance_s* vf)
+static void uninit(struct vf_instance* vf)
 {
     HRESULT ret;
 
diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c
index dadfb748d9..ec85de4929 100644
--- a/libmpcodecs/ve_x264.c
+++ b/libmpcodecs/ve_x264.c
@@ -73,8 +73,8 @@ static int encode_nals(uint8_t *buf, int size, x264_nal_t *nals, int nnal){
     return p - buf;
 }
 
-static int put_image(struct vf_instance_s *vf, mp_image_t *mpi, double pts);
-static int encode_frame(struct vf_instance_s *vf, x264_picture_t *pic_in);
+static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts);
+static int encode_frame(struct vf_instance *vf, x264_picture_t *pic_in);
 
 void x264enc_set_param(const m_option_t* opt, char* arg)
 {
@@ -148,7 +148,7 @@ void x264enc_set_param(const m_option_t* opt, char* arg)
     }
 }
 
-static int config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) {
+static int config(struct vf_instance* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) {
     h264_module_t *mod=(h264_module_t*)vf->priv;
 
     if(parse_error)
@@ -215,7 +215,7 @@ static int config(struct vf_instance_s* vf, int width, int height, int d_width,
     return 1;
 }
 
-static int control(struct vf_instance_s* vf, int request, void *data)
+static int control(struct vf_instance* vf, int request, void *data)
 {
     h264_module_t *mod=(h264_module_t*)vf->priv;
     switch(request){
@@ -228,7 +228,7 @@ static int control(struct vf_instance_s* vf, int request, void *data)
     }
 }
 
-static int query_format(struct vf_instance_s* vf, unsigned int fmt)
+static int query_format(struct vf_instance* vf, unsigned int fmt)
 {
     switch(fmt) {
     case IMGFMT_I420:
@@ -247,7 +247,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt)
     return 0;
 }
 
-static int put_image(struct vf_instance_s *vf, mp_image_t *mpi, double pts)
+static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts)
 {
     h264_module_t *mod=(h264_module_t*)vf->priv;
     int i;
@@ -265,7 +265,7 @@ static int put_image(struct vf_instance_s *vf, mp_image_t *mpi, double pts)
     return encode_frame(vf, &mod->pic) >= 0;
 }
 
-static int encode_frame(struct vf_instance_s *vf, x264_picture_t *pic_in)
+static int encode_frame(struct vf_instance *vf, x264_picture_t *pic_in)
 {
     h264_module_t *mod=(h264_module_t*)vf->priv;
     x264_picture_t pic_out;
@@ -296,7 +296,7 @@ static int encode_frame(struct vf_instance_s *vf, x264_picture_t *pic_in)
     return i_size;
 }
 
-static void uninit(struct vf_instance_s *vf)
+static void uninit(struct vf_instance *vf)
 {
     h264_module_t *mod=(h264_module_t*)vf->priv;
     if (mod->x264)
diff --git a/libmpcodecs/ve_xvid4.c b/libmpcodecs/ve_xvid4.c
index 559f80dd36..2a62ee6fb5 100644
--- a/libmpcodecs/ve_xvid4.c
+++ b/libmpcodecs/ve_xvid4.c
@@ -374,7 +374,7 @@ static const char *errorstring(int err);
  *==========================================================================*/
 
 static int
-config(struct vf_instance_s* vf,
+config(struct vf_instance* vf,
        int width, int height, int d_width, int d_height,
        unsigned int flags, unsigned int outfmt)
 {
@@ -439,7 +439,7 @@ config(struct vf_instance_s* vf,
  *==========================================================================*/
 
 static void
-uninit(struct vf_instance_s* vf)
+uninit(struct vf_instance* vf)
 {
 
 	xvid_mplayer_module_t *mod = (xvid_mplayer_module_t *)vf->priv;
@@ -477,7 +477,7 @@ uninit(struct vf_instance_s* vf)
  *==========================================================================*/
 
 static int
-control(struct vf_instance_s* vf, int request, void* data)
+control(struct vf_instance* vf, int request, void* data)
 {
 xvid_mplayer_module_t *mod = (xvid_mplayer_module_t *)vf->priv;
 
@@ -495,7 +495,7 @@ xvid_mplayer_module_t *mod = (xvid_mplayer_module_t *)vf->priv;
  *==========================================================================*/
 
 static int
-query_format(struct vf_instance_s* vf, unsigned int fmt)
+query_format(struct vf_instance* vf, unsigned int fmt)
 {
 	switch(fmt){
 	case IMGFMT_YV12:
@@ -514,7 +514,7 @@ query_format(struct vf_instance_s* vf, unsigned int fmt)
  *==========================================================================*/
 
 static int
-put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts)
+put_image(struct vf_instance* vf, mp_image_t *mpi, double pts)
 {
 	int size;
 	xvid_enc_stats_t stats; 
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c
index 14b2fe1168..d5281c4737 100644
--- a/libmpcodecs/vf.c
+++ b/libmpcodecs/vf.c
@@ -421,7 +421,7 @@ mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype,
 //============================================================================
 
 // By default vf doesn't accept MPEGPES
-static int vf_default_query_format(struct vf_instance_s* vf, unsigned int fmt){
+static int vf_default_query_format(struct vf_instance* vf, unsigned int fmt){
   if(fmt == IMGFMT_MPEGPES) return 0;
   return vf_next_query_format(vf,fmt);
 }
@@ -598,7 +598,7 @@ int vf_output_queued_frame(vf_instance_t *vf)
  * are unchanged, and returns either success or error.
  *
 */
-int vf_config_wrapper(struct vf_instance_s* vf,
+int vf_config_wrapper(struct vf_instance* vf,
 		    int width, int height, int d_width, int d_height,
 		    unsigned int flags, unsigned int outfmt)
 {
@@ -621,7 +621,7 @@ int vf_config_wrapper(struct vf_instance_s* vf,
     return r;
 }
 
-int vf_next_config(struct vf_instance_s* vf,
+int vf_next_config(struct vf_instance* vf,
         int width, int height, int d_width, int d_height,
 	unsigned int voflags, unsigned int outfmt){
     struct MPOpts *opts = vf->opts;
@@ -654,21 +654,21 @@ int vf_next_config(struct vf_instance_s* vf,
     return vf_config_wrapper(vf->next,width,height,d_width,d_height,voflags,outfmt);
 }
 
-int vf_next_control(struct vf_instance_s* vf, int request, void* data){
+int vf_next_control(struct vf_instance* vf, int request, void* data){
     return vf->next->control(vf->next,request,data);
 }
 
-int vf_next_query_format(struct vf_instance_s* vf, unsigned int fmt){
+int vf_next_query_format(struct vf_instance* vf, unsigned int fmt){
     int flags=vf->next->query_format(vf->next,fmt);
     if(flags) flags|=vf->default_caps;
     return flags;
 }
 
-int vf_next_put_image(struct vf_instance_s* vf,mp_image_t *mpi, double pts){
+int vf_next_put_image(struct vf_instance* vf,mp_image_t *mpi, double pts){
     return vf->next->put_image(vf->next,mpi, pts);
 }
 
-void vf_next_draw_slice(struct vf_instance_s* vf,unsigned char** src, int * stride,int w, int h, int x, int y){
+void vf_next_draw_slice(struct vf_instance* vf,unsigned char** src, int * stride,int w, int h, int x, int y){
     if (vf->next->draw_slice) {
 	vf->next->draw_slice(vf->next,src,stride,w,h,x,y);
 	return;
diff --git a/libmpcodecs/vf.h b/libmpcodecs/vf.h
index 272d33b6e2..68b4fb468f 100644
--- a/libmpcodecs/vf.h
+++ b/libmpcodecs/vf.h
@@ -4,7 +4,7 @@
 #include "mp_image.h"
 
 struct MPOpts;
-struct vf_instance_s;
+struct vf_instance;
 struct vf_priv_s;
 
 typedef struct vf_info_s {
@@ -12,7 +12,7 @@ typedef struct vf_info_s {
     const char *name;
     const char *author;
     const char *comment;
-    int (*open)(struct vf_instance_s* vf,char* args);
+    int (*open)(struct vf_instance* vf,char* args);
     // Ptr to a struct dscribing the options
     const void* opts;
 } vf_info_t;
@@ -29,27 +29,27 @@ typedef struct vf_format_context_t {
     int orig_width, orig_height, orig_fmt;
 } vf_format_context_t;
 
-typedef struct vf_instance_s {
+typedef struct vf_instance {
     const vf_info_t* info;
     // funcs:
-    int (*config)(struct vf_instance_s* vf,
+    int (*config)(struct vf_instance* vf,
         int width, int height, int d_width, int d_height,
 	unsigned int flags, unsigned int outfmt);
-    int (*control)(struct vf_instance_s* vf,
+    int (*control)(struct vf_instance* vf,
         int request, void* data);
-    int (*query_format)(struct vf_instance_s* vf,
+    int (*query_format)(struct vf_instance* vf,
         unsigned int fmt);
-    void (*get_image)(struct vf_instance_s* vf,
+    void (*get_image)(struct vf_instance* vf,
         mp_image_t *mpi);
-    int (*put_image)(struct vf_instance_s* vf,
+    int (*put_image)(struct vf_instance* vf,
         mp_image_t *mpi, double pts);
-    void (*start_slice)(struct vf_instance_s* vf,
+    void (*start_slice)(struct vf_instance* vf,
         mp_image_t *mpi);
-    void (*draw_slice)(struct vf_instance_s* vf,
+    void (*draw_slice)(struct vf_instance* vf,
         unsigned char** src, int* stride, int w,int h, int x, int y);
-    void (*uninit)(struct vf_instance_s* vf);
+    void (*uninit)(struct vf_instance* vf);
 
-    int (*continue_buffered_image)(struct vf_instance_s* vf);
+    int (*continue_buffered_image)(struct vf_instance* vf);
     // caps:
     unsigned int default_caps; // used by default query_format()
     unsigned int default_reqs; // used by default config()
@@ -57,7 +57,7 @@ typedef struct vf_instance_s {
     int w, h;
     vf_image_context_t imgctx;
     vf_format_context_t fmt;
-    struct vf_instance_s* next;
+    struct vf_instance* next;
     mp_image_t *dmpi;
     struct vf_priv_s* priv;
     struct MPOpts *opts;
@@ -110,20 +110,20 @@ void vf_queue_frame(vf_instance_t *vf, int (*)(vf_instance_t *));
 int vf_output_queued_frame(vf_instance_t *vf);
 
 // default wrappers:
-int vf_next_config(struct vf_instance_s* vf,
+int vf_next_config(struct vf_instance* vf,
         int width, int height, int d_width, int d_height,
 	unsigned int flags, unsigned int outfmt);
-int vf_next_control(struct vf_instance_s* vf, int request, void* data);
-int vf_next_query_format(struct vf_instance_s* vf, unsigned int fmt);
-int vf_next_put_image(struct vf_instance_s* vf,mp_image_t *mpi, double pts);
-void vf_next_draw_slice (struct vf_instance_s* vf, unsigned char** src, int* stride, int w,int h, int x, int y);
+int vf_next_control(struct vf_instance* vf, int request, void* data);
+int vf_next_query_format(struct vf_instance* vf, unsigned int fmt);
+int vf_next_put_image(struct vf_instance* vf,mp_image_t *mpi, double pts);
+void vf_next_draw_slice (struct vf_instance* vf, unsigned char** src, int* stride, int w,int h, int x, int y);
 
 vf_instance_t* append_filters(vf_instance_t* last);
 
 void vf_uninit_filter(vf_instance_t* vf);
 void vf_uninit_filter_chain(vf_instance_t* vf);
 
-int vf_config_wrapper(struct vf_instance_s* vf,
+int vf_config_wrapper(struct vf_instance* vf,
 		      int width, int height, int d_width, int d_height,
 		      unsigned int flags, unsigned int outfmt);
 
diff --git a/libmpcodecs/vf_1bpp.c b/libmpcodecs/vf_1bpp.c
index 873e431855..c4fd04c338 100644
--- a/libmpcodecs/vf_1bpp.c
+++ b/libmpcodecs/vf_1bpp.c
@@ -40,7 +40,7 @@ static const unsigned int bgr_list[]={
     0
 };
 
-static unsigned int find_best(struct vf_instance_s* vf){
+static unsigned int find_best(struct vf_instance* vf){
     unsigned int best=0;
     int ret;
     const unsigned int* p=bgr_list;
@@ -60,7 +60,7 @@ struct vf_priv_s {
     unsigned int fmt;
 };
 
-static int config(struct vf_instance_s* vf,
+static int config(struct vf_instance* vf,
         int width, int height, int d_width, int d_height,
 	unsigned int flags, unsigned int outfmt){
     if (!vf->priv->fmt)
@@ -103,7 +103,7 @@ static void convert(mp_image_t *mpi, mp_image_t *dmpi, int value0, int value1,in
     }
 }
 
-static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
+static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){
     mp_image_t *dmpi;
     
     // hope we'll get DR buffer:
@@ -154,7 +154,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
 
 //===========================================================================//
 
-static int query_format(struct vf_instance_s* vf, unsigned int fmt){
+static int query_format(struct vf_instance* vf, unsigned int fmt){
     int best;
     if(fmt!=IMGFMT_RGB1 && fmt!=IMGFMT_BGR1) return 0;
     best=find_best(vf);
diff --git a/libmpcodecs/vf_2xsai.c b/libmpcodecs/vf_2xsai.c
index 97a0182767..efa58611e6 100644
--- a/libmpcodecs/vf_2xsai.c
+++ b/libmpcodecs/vf_2xsai.c
@@ -262,7 +262,7 @@ void Super2xSaI_ex(uint8_t *src, uint32_t src_pitch,
 
 //===========================================================================//
 
-static int config(struct vf_instance_s* vf,
+static int config(struct vf_instance* vf,
         int width, int height, int d_width, int d_height,
 	unsigned int flags, unsigned int outfmt){
 
@@ -271,7 +271,7 @@ static int config(struct vf_instance_s* vf,
     return vf_next_config(vf,2*width,2*height,2*d_width,2*d_height,flags,outfmt);
 }
 
-static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
+static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){
     mp_image_t *dmpi;
 
     // hope we'll get DR buffer:
@@ -288,7 +288,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
 
 //===========================================================================//
 
-static int query_format(struct vf_instance_s* vf, unsigned int fmt){
+static int query_format(struct vf_instance* vf, unsigned int fmt){
     switch(fmt){
 //    case IMGFMT_BGR15:
 //    case IMGFMT_BGR16:
diff --git a/libmpcodecs/vf_ass.c b/libmpcodecs/vf_ass.c
index a04f0e557a..1790782111 100644
--- a/libmpcodecs/vf_ass.c
+++ b/libmpcodecs/vf_ass.c
@@ -73,7 +73,7 @@ extern ass_track_t* ass_track;
 extern float sub_delay;
 extern int sub_visibility;
 
-static int config(struct vf_instance_s* vf,
+static int config(struct vf_instance* vf,
 	int width, int height, int d_width, int d_height,
 	unsigned int flags, unsigned int outfmt)
 {
@@ -99,7 +99,7 @@ static int config(struct vf_instance_s* vf,
 	return vf_next_config(vf, vf->priv->outw, vf->priv->outh, d_width, d_height, flags, outfmt);
 }
 
-static void get_image(struct vf_instance_s* vf, mp_image_t *mpi)
+static void get_image(struct vf_instance* vf, mp_image_t *mpi)
 {
 	if(mpi->type == MP_IMGTYPE_IPB) return;
 	if(mpi->flags & MP_IMGFLAG_PRESERVE) return;
@@ -158,7 +158,7 @@ static void blank(mp_image_t *mpi, int y1, int y2)
 	}
 }
 
-static int prepare_image(struct vf_instance_s* vf, mp_image_t *mpi)
+static int prepare_image(struct vf_instance* vf, mp_image_t *mpi)
 {
 	if(mpi->flags&MP_IMGFLAG_DIRECT || mpi->flags&MP_IMGFLAG_DRAW_CALLBACK){
 		vf->dmpi = mpi->priv;
@@ -206,7 +206,7 @@ static int prepare_image(struct vf_instance_s* vf, mp_image_t *mpi)
 /**
  * \brief Copy specified rows from render_context.dmpi to render_context.planes, upsampling to 4:4:4
  */
-static void copy_from_image(struct vf_instance_s* vf, int first_row, int last_row)
+static void copy_from_image(struct vf_instance* vf, int first_row, int last_row)
 {
 	int pl;
 	int i, j, k;
@@ -248,7 +248,7 @@ static void copy_from_image(struct vf_instance_s* vf, int first_row, int last_ro
 /**
  * \brief Copy all previously copied rows back to render_context.dmpi
  */
-static void copy_to_image(struct vf_instance_s* vf)
+static void copy_to_image(struct vf_instance* vf)
 {
 	int pl;
 	int i, j, k;
@@ -279,7 +279,7 @@ static void copy_to_image(struct vf_instance_s* vf)
 	}
 }
 
-static void my_draw_bitmap(struct vf_instance_s* vf, unsigned char* bitmap, int bitmap_w, int bitmap_h, int stride, int dst_x, int dst_y, unsigned color)
+static void my_draw_bitmap(struct vf_instance* vf, unsigned char* bitmap, int bitmap_w, int bitmap_h, int stride, int dst_x, int dst_y, unsigned color)
 {
 	unsigned char y = rgba2y(color);
 	unsigned char u = rgba2u(color);
@@ -307,7 +307,7 @@ static void my_draw_bitmap(struct vf_instance_s* vf, unsigned char* bitmap, int
 	} 
 }
 
-static int render_frame(struct vf_instance_s* vf, mp_image_t *mpi, const ass_image_t* img)
+static int render_frame(struct vf_instance* vf, mp_image_t *mpi, const ass_image_t* img)
 {
 	if (img) {
 		memset(vf->priv->dirty_rows, 0, vf->priv->outh); // reset dirty rows
@@ -322,7 +322,7 @@ static int render_frame(struct vf_instance_s* vf, mp_image_t *mpi, const ass_ima
 	return 0;
 }
 
-static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts)
+static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts)
 {
 	ass_image_t* images = 0;
 	if (sub_visibility && vf->priv->ass_priv && ass_track && (pts != MP_NOPTS_VALUE))
@@ -334,7 +334,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts)
 	return vf_next_put_image(vf, vf->dmpi, pts);
 }
 
-static int query_format(struct vf_instance_s* vf, unsigned int fmt)
+static int query_format(struct vf_instance* vf, unsigned int fmt)
 {
 	switch(fmt){
 	case IMGFMT_YV12:
@@ -360,7 +360,7 @@ static int control(vf_instance_t *vf, int request, void *data)
 	return vf_next_control(vf, request, data);
 }
 
-static void uninit(struct vf_instance_s* vf)
+static void uninit(struct vf_instance* vf)
 {
 	if (vf->priv->ass_priv)
 		ass_renderer_done(vf->priv->ass_priv);
diff --git a/libmpcodecs/vf_blackframe.c b/libmpcodecs/vf_blackframe.c
index a405803429..2597baada8 100644
--- a/libmpcodecs/vf_blackframe.c
+++ b/libmpcodecs/vf_blackframe.c
@@ -40,12 +40,12 @@ struct vf_priv_s {
     unsigned int bamount, bthresh, frame, lastkeyframe;
 };
 
-static int config(struct vf_instance_s* vf, int width, int height, int d_width,
+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 query_format(struct vf_instance_s *vf, unsigned fmt) {
+static int query_format(struct vf_instance *vf, unsigned fmt) {
     switch(fmt) {
     case IMGFMT_YVU9:
     case IMGFMT_IF09:
@@ -66,7 +66,7 @@ static int query_format(struct vf_instance_s *vf, unsigned fmt) {
     return 0;
 }
 
-static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
+static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){
     mp_image_t *dmpi;
     int x, y;
     int nblack=0, pblack=0;
@@ -110,11 +110,11 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
     return vf_next_put_image(vf, dmpi, pts);
 }
 
-static int control(struct vf_instance_s* vf, int request, void* data){
+static int control(struct vf_instance* vf, int request, void* data){
     return vf_next_control(vf,request,data);
 }
 
-static void uninit(struct vf_instance_s *vf) {
+static void uninit(struct vf_instance *vf) {
     if (vf->priv) free(vf->priv);
 }
 
diff --git a/libmpcodecs/vf_bmovl.c b/libmpcodecs/vf_bmovl.c
index ab2c23944c..0cadc63b70 100644
--- a/libmpcodecs/vf_bmovl.c
+++ b/libmpcodecs/vf_bmovl.c
@@ -107,14 +107,14 @@ struct vf_priv_s {
 };
 
 static int
-query_format(struct vf_instance_s* vf, unsigned int fmt){
+query_format(struct vf_instance* vf, unsigned int fmt){
     if(fmt==IMGFMT_YV12) return VFCAP_CSP_SUPPORTED;
     return 0;
 }
 
 
 static int
-config(struct vf_instance_s* vf,
+config(struct vf_instance* vf,
        int width, int height, int d_width, int d_height,
        unsigned int flags, unsigned int outfmt)
 {
@@ -144,7 +144,7 @@ config(struct vf_instance_s* vf,
 }
 
 static void
-uninit(struct vf_instance_s *vf)
+uninit(struct vf_instance *vf)
 {
 	if(vf->priv) {
 		free(vf->priv->bitmap.y);
@@ -196,7 +196,7 @@ _read_cmd(int fd, char *cmd, char *args) {
 			
 
 static int
-put_image(struct vf_instance_s* vf, mp_image_t* mpi, double pts){
+put_image(struct vf_instance* vf, mp_image_t* mpi, double pts){
 	int buf_x=0, buf_y=0, buf_pos=0;
 	int have, got, want;
 	int xpos=0, ypos=0, pos=0;
diff --git a/libmpcodecs/vf_boxblur.c b/libmpcodecs/vf_boxblur.c
index a45e72889d..be25b332f3 100644
--- a/libmpcodecs/vf_boxblur.c
+++ b/libmpcodecs/vf_boxblur.c
@@ -50,7 +50,7 @@ struct vf_priv_s {
 /***************************************************************************/
 
 
-static int config(struct vf_instance_s* vf,
+static int config(struct vf_instance* vf,
         int width, int height, int d_width, int d_height,
 	unsigned int flags, unsigned int outfmt){
 
@@ -131,7 +131,7 @@ static void vBlur(uint8_t *dst, uint8_t *src, int w, int h, int dstStride, int s
 	}
 }
 
-static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
+static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){
 	int cw= mpi->w >> mpi->chroma_x_shift;
 	int ch= mpi->h >> mpi->chroma_y_shift;
 
@@ -160,7 +160,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
 
 //===========================================================================//
 
-static int query_format(struct vf_instance_s* vf, unsigned int fmt){
+static int query_format(struct vf_instance* vf, unsigned int fmt){
 	switch(fmt)
 	{
 	case IMGFMT_YV12:
diff --git a/libmpcodecs/vf_crop.c b/libmpcodecs/vf_crop.c
index c9bd11c6c7..865ecf8d6a 100644
--- a/libmpcodecs/vf_crop.c
+++ b/libmpcodecs/vf_crop.c
@@ -26,7 +26,7 @@ extern int opt_screen_size_y;
 
 //===========================================================================//
 
-static int config(struct vf_instance_s* vf,
+static int config(struct vf_instance* vf,
         int width, int height, int d_width, int d_height,
 	unsigned int flags, unsigned int outfmt){
     // calculate the missing parameters:
@@ -68,7 +68,7 @@ static int config(struct vf_instance_s* vf,
     return vf_next_config(vf,vf->priv->crop_w,vf->priv->crop_h,d_width,d_height,flags,outfmt);
 }
 
-static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
+static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){
     mp_image_t *dmpi;
     if (mpi->flags&MP_IMGFLAG_DRAW_CALLBACK)
 	return vf_next_put_image(vf,vf->dmpi, pts);
@@ -95,12 +95,12 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
     return vf_next_put_image(vf,dmpi, pts);
 }
 
-static void start_slice(struct vf_instance_s* vf, mp_image_t *mpi){
+static void start_slice(struct vf_instance* vf, mp_image_t *mpi){
     vf->dmpi = vf_get_image(vf->next, mpi->imgfmt, mpi->type, mpi->flags,
 	vf->priv->crop_w, vf->priv->crop_h);
 }
 
-static void draw_slice(struct vf_instance_s* vf,
+static void draw_slice(struct vf_instance* vf,
         unsigned char** src, int* stride, int w,int h, int x, int y){
     unsigned char *src2[3];
     src2[0] = src[0];
diff --git a/libmpcodecs/vf_cropdetect.c b/libmpcodecs/vf_cropdetect.c
index 31389d5fb0..68e6eb1011 100644
--- a/libmpcodecs/vf_cropdetect.c
+++ b/libmpcodecs/vf_cropdetect.c
@@ -42,7 +42,7 @@ static int checkline(unsigned char* src,int stride,int len,int bpp){
 
 //===========================================================================//
 
-static int config(struct vf_instance_s* vf,
+static int config(struct vf_instance* vf,
         int width, int height, int d_width, int d_height,
 	unsigned int flags, unsigned int outfmt){
     vf->priv->x1=width - 1;
@@ -53,7 +53,7 @@ static int config(struct vf_instance_s* vf,
     return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
 }
 
-static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
+static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){
     mp_image_t *dmpi;
     int bpp=mpi->bpp/8;
     int w,h,x,y,shrink_by;
@@ -136,7 +136,7 @@ if(++vf->priv->fno>2){	// ignore first 2 frames - they may be empty
     return vf_next_put_image(vf,dmpi, pts);
 }
 
-static int query_format(struct vf_instance_s* vf, unsigned int fmt) {
+static int query_format(struct vf_instance* vf, unsigned int fmt) {
   switch(fmt) {
     // the default limit value works only right with YV12 right now.
     case IMGFMT_YV12:
diff --git a/libmpcodecs/vf_decimate.c b/libmpcodecs/vf_decimate.c
index fd591bdca3..5fb633d3c5 100644
--- a/libmpcodecs/vf_decimate.c
+++ b/libmpcodecs/vf_decimate.c
@@ -110,7 +110,7 @@ static int diff_to_drop(int hi, int lo, float frac, mp_image_t *old, mp_image_t
 		new->w*(new->bpp/8), new->h, old->stride[0], new->stride[0]);
 }
 
-static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts)
+static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts)
 {
 	mp_image_t *dmpi;
 
@@ -146,7 +146,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts)
 	return vf_next_put_image(vf, dmpi, pts);
 }
 
-static void uninit(struct vf_instance_s* vf)
+static void uninit(struct vf_instance* vf)
 {
 	free(vf->priv);
 }
diff --git a/libmpcodecs/vf_delogo.c b/libmpcodecs/vf_delogo.c
index 926d0dd56d..493ddb55f0 100644
--- a/libmpcodecs/vf_delogo.c
+++ b/libmpcodecs/vf_delogo.c
@@ -121,7 +121,7 @@ static void delogo(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int
     }
 }
 
-static int config(struct vf_instance_s* vf,
+static int config(struct vf_instance* vf,
 		  int width, int height, int d_width, int d_height,
 		  unsigned int flags, unsigned int outfmt){
 
@@ -129,7 +129,7 @@ static int config(struct vf_instance_s* vf,
 }
 
 
-static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static void get_image(struct vf_instance* vf, mp_image_t *mpi){
     if(mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change
     if(mpi->imgfmt!=vf->priv->outfmt) return; // colorspace differ
     // ok, we can do pp in-place (or pp disabled):
@@ -147,7 +147,7 @@ static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){
     mpi->flags|=MP_IMGFLAG_DIRECT;
 }
 
-static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
+static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){
     mp_image_t *dmpi;
 
     if(!(mpi->flags&MP_IMGFLAG_DIRECT)){
@@ -173,7 +173,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
     return vf_next_put_image(vf,dmpi, pts);
 }
 
-static void uninit(struct vf_instance_s* vf){
+static void uninit(struct vf_instance* vf){
     if(!vf->priv) return;
 
     free(vf->priv);
@@ -182,7 +182,7 @@ static void uninit(struct vf_instance_s* vf){
 
 //===========================================================================//
 
-static int query_format(struct vf_instance_s* vf, unsigned int fmt){
+static int query_format(struct vf_instance* vf, unsigned int fmt){
     switch(fmt)
     {
     case IMGFMT_YV12:
diff --git a/libmpcodecs/vf_denoise3d.c b/libmpcodecs/vf_denoise3d.c
index aa264d33e1..2e2d217e27 100644
--- a/libmpcodecs/vf_denoise3d.c
+++ b/libmpcodecs/vf_denoise3d.c
@@ -49,7 +49,7 @@ struct vf_priv_s {
 /***************************************************************************/
 
 
-static int config(struct vf_instance_s* vf,
+static int config(struct vf_instance* vf,
         int width, int height, int d_width, int d_height,
 	unsigned int flags, unsigned int outfmt){
 
@@ -62,7 +62,7 @@ static int config(struct vf_instance_s* vf,
 }
 
 
-static void uninit(struct vf_instance_s* vf)
+static void uninit(struct vf_instance* vf)
 {
     free(vf->priv->Line);
 }
@@ -113,7 +113,7 @@ static void deNoise(unsigned char *Frame,        // mpi->planes[x]
 
 
 
-static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
+static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){
 	int cw= mpi->w >> mpi->chroma_x_shift;
 	int ch= mpi->h >> mpi->chroma_y_shift;
         int W = mpi->w, H = mpi->h;
@@ -151,7 +151,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
 
 //===========================================================================//
 
-static int query_format(struct vf_instance_s* vf, unsigned int fmt){
+static int query_format(struct vf_instance* vf, unsigned int fmt){
         switch(fmt)
 	{
 	case IMGFMT_YV12:
diff --git a/libmpcodecs/vf_detc.c b/libmpcodecs/vf_detc.c
index d76e34efd2..4e935cd01b 100644
--- a/libmpcodecs/vf_detc.c
+++ b/libmpcodecs/vf_detc.c
@@ -267,7 +267,7 @@ static void copy_image(mp_image_t *dmpi, mp_image_t *mpi, int field)
 	}
 }
 
-static int do_put_image(struct vf_instance_s* vf, mp_image_t *dmpi)
+static int do_put_image(struct vf_instance* vf, mp_image_t *dmpi)
 {
 	struct vf_priv_s *p = vf->priv;
 	int dropflag;
@@ -295,7 +295,7 @@ static int do_put_image(struct vf_instance_s* vf, mp_image_t *dmpi)
 	return vf_next_put_image(vf, dmpi, MP_NOPTS_VALUE);
 }
 
-static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts)
+static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts)
 {
 	int ret=0;
 	mp_image_t *dmpi;
@@ -339,7 +339,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts)
 	return ret;
 }
 
-static int query_format(struct vf_instance_s* vf, unsigned int fmt)
+static int query_format(struct vf_instance* vf, unsigned int fmt)
 {
 	/* FIXME - figure out which other formats work */
 	switch (fmt) {
@@ -351,14 +351,14 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt)
 	return 0;
 }
 
-static int config(struct vf_instance_s* vf,
+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 void uninit(struct vf_instance_s* vf)
+static void uninit(struct vf_instance* vf)
 {
 	free(vf->priv);
 }
diff --git a/libmpcodecs/vf_dint.c b/libmpcodecs/vf_dint.c
index b978062d73..62422fb1c4 100644
--- a/libmpcodecs/vf_dint.c
+++ b/libmpcodecs/vf_dint.c
@@ -24,7 +24,7 @@ struct vf_priv_s {
 
 #define MAXROWSIZE 1200
 
-static int config (struct vf_instance_s* vf,
+static int config (struct vf_instance* vf,
         int width, int height, int d_width, int d_height,
 	unsigned int flags, unsigned int outfmt)
 {
@@ -61,7 +61,7 @@ static int config (struct vf_instance_s* vf,
     return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
 }
 
-static int put_image (struct vf_instance_s* vf, mp_image_t *mpi, double pts)
+static int put_image (struct vf_instance* vf, mp_image_t *mpi, double pts)
 {
     char rrow0[MAXROWSIZE];
     char rrow1[MAXROWSIZE];
diff --git a/libmpcodecs/vf_divtc.c b/libmpcodecs/vf_divtc.c
index d2fcb48dbe..ec6b35d17a 100644
--- a/libmpcodecs/vf_divtc.c
+++ b/libmpcodecs/vf_divtc.c
@@ -239,7 +239,7 @@ static int match(struct vf_priv_s *p, int *diffs,
    return m;
    }
 
-static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts)
+static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts)
    {
    mp_image_t *dmpi, *tmpi=0;
    int n, m, f, newphase;
@@ -550,7 +550,7 @@ static int analyze(struct vf_priv_s *p)
    return 1;
    }
 
-static int query_format(struct vf_instance_s* vf, unsigned int fmt)
+static int query_format(struct vf_instance* vf, unsigned int fmt)
    {
    switch(fmt)
       {
@@ -565,7 +565,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt)
    return 0;
    }
 
-static void uninit(struct vf_instance_s* vf)
+static void uninit(struct vf_instance* vf)
    {
    if(vf->priv)
       {
diff --git a/libmpcodecs/vf_down3dright.c b/libmpcodecs/vf_down3dright.c
index feb591cb30..3ad2209d33 100644
--- a/libmpcodecs/vf_down3dright.c
+++ b/libmpcodecs/vf_down3dright.c
@@ -78,7 +78,7 @@ static void toright(unsigned char *dst[3], unsigned char *src[3],
 	}
 }
 
-static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts)
+static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts)
 {
 	mp_image_t *dmpi;
 
@@ -95,7 +95,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts)
 	return vf_next_put_image(vf,dmpi, pts);
 }
 
-static int config(struct vf_instance_s* vf,
+static int config(struct vf_instance* vf,
 		  int width, int height, int d_width, int d_height,
 		  unsigned int flags, unsigned int outfmt)
 {
@@ -105,7 +105,7 @@ static int config(struct vf_instance_s* vf,
 }
 
 
-static int query_format(struct vf_instance_s* vf, unsigned int fmt)
+static int query_format(struct vf_instance* vf, unsigned int fmt)
 {
 	/* FIXME - really any YUV 4:2:0 input format should work */
 	switch (fmt) {
@@ -117,7 +117,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt)
 	return 0;
 }
 
-static void uninit(struct vf_instance_s* vf)
+static void uninit(struct vf_instance* vf)
 {
 	free(vf->priv);
 }
diff --git a/libmpcodecs/vf_dsize.c b/libmpcodecs/vf_dsize.c
index 324ddf169a..2ec4acfe3d 100644
--- a/libmpcodecs/vf_dsize.c
+++ b/libmpcodecs/vf_dsize.c
@@ -17,7 +17,7 @@ struct vf_priv_s {
 	float aspect;
 };
 
-static int config(struct vf_instance_s* vf,
+static int config(struct vf_instance* vf,
 	int width, int height, int d_width, int d_height,
 	unsigned int flags, unsigned int outfmt)
 {
diff --git a/libmpcodecs/vf_dvbscale.c b/libmpcodecs/vf_dvbscale.c
index fedf07046c..d54490d6fc 100644
--- a/libmpcodecs/vf_dvbscale.c
+++ b/libmpcodecs/vf_dvbscale.c
@@ -16,7 +16,7 @@ struct vf_priv_s {
 
 //===========================================================================//
 
-static int config(struct vf_instance_s* vf,
+static int config(struct vf_instance* vf,
         int width, int height, int d_width, int d_height,
 	unsigned int flags, unsigned int outfmt){
 
diff --git a/libmpcodecs/vf_eq.c b/libmpcodecs/vf_eq.c
index 0c910b0556..d6bf1b001e 100644
--- a/libmpcodecs/vf_eq.c
+++ b/libmpcodecs/vf_eq.c
@@ -114,7 +114,7 @@ static void (*process)(unsigned char *dest, int dstride, unsigned char *src, int
 
 /* FIXME: add packed yuv version of process */
 
-static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts)
+static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts)
 {
 	mp_image_t *dmpi;
 
@@ -143,7 +143,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts)
 	return vf_next_put_image(vf,dmpi, pts);
 }
 
-static int control(struct vf_instance_s* vf, int request, void* data)
+static int control(struct vf_instance* vf, int request, void* data)
 {
 	vf_equalizer_t *eq;
 
@@ -174,7 +174,7 @@ static int control(struct vf_instance_s* vf, int request, void* data)
 	return vf_next_control(vf, request, data);
 }
 
-static int query_format(struct vf_instance_s* vf, unsigned int fmt)
+static int query_format(struct vf_instance* vf, unsigned int fmt)
 {
 	switch (fmt) {
 	case IMGFMT_YVU9:
@@ -195,7 +195,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt)
 	return 0;
 }
 
-static void uninit(struct vf_instance_s* vf)
+static void uninit(struct vf_instance* vf)
 {
 	if (vf->priv->buf) free(vf->priv->buf);
 	free(vf->priv);
diff --git a/libmpcodecs/vf_expand.c b/libmpcodecs/vf_expand.c
index 8c4f1445a7..4b46f04e23 100644
--- a/libmpcodecs/vf_expand.c
+++ b/libmpcodecs/vf_expand.c
@@ -50,7 +50,7 @@ extern int opt_screen_size_y;
 //===========================================================================//
 #ifdef OSD_SUPPORT
 
-static struct vf_instance_s* vf=NULL; // fixme (needs sub.c changes)
+static struct vf_instance* vf=NULL; // fixme (needs sub.c changes)
 static int orig_w,orig_h;
 
 static void remove_func_2(int x0,int y0, int w,int h){
@@ -156,7 +156,7 @@ static void draw_func(void *ctx, int x0,int y0, int w,int h,unsigned char* src,
     }
 }
 
-static void draw_osd(struct vf_instance_s* vf_,int w,int h){
+static void draw_osd(struct vf_instance* vf_,int w,int h){
     vf=vf_;orig_w=w;orig_h=h;
 //    printf("======================================\n");
     if(vf->priv->exp_w!=w || vf->priv->exp_h!=h ||
@@ -187,7 +187,7 @@ static void draw_osd(struct vf_instance_s* vf_,int w,int h){
 #endif
 //===========================================================================//
 
-static int config(struct vf_instance_s* vf,
+static int config(struct vf_instance* vf,
         int width, int height, int d_width, int d_height,
 	unsigned int flags, unsigned int outfmt){
     if(outfmt == IMGFMT_MPEGPES) {
@@ -238,7 +238,7 @@ static int config(struct vf_instance_s* vf,
 // codec -copy-> expand --DR--> vo
 // codec -copy-> expand -copy-> vo (worst case)
 
-static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static void get_image(struct vf_instance* vf, mp_image_t *mpi){
 //    if(mpi->type==MP_IMGTYPE_IPB) return; // not yet working
 #ifdef OSD_SUPPORT
     if(vf->priv->osd && (mpi->flags&MP_IMGFLAG_PRESERVE)){
@@ -285,7 +285,7 @@ static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){
     }
 }
 
-static void start_slice(struct vf_instance_s* vf, mp_image_t *mpi){
+static void start_slice(struct vf_instance* vf, mp_image_t *mpi){
 //    printf("start_slice called! flag=%d\n",mpi->flags&MP_IMGFLAG_DRAW_CALLBACK);
     if(!vf->next->draw_slice){
 	mpi->flags&=~MP_IMGFLAG_DRAW_CALLBACK;
@@ -303,7 +303,7 @@ static void start_slice(struct vf_instance_s* vf, mp_image_t *mpi){
     vf->priv->first_slice = 1;
 }
 
-static void draw_top_blackbar_slice(struct vf_instance_s* vf,
+static void draw_top_blackbar_slice(struct vf_instance* vf,
 				    unsigned char** src, int* stride, int w,int h, int x, int y){
     if(vf->priv->exp_y>0 && y == 0) {
 	vf_next_draw_slice(vf, vf->dmpi->planes, vf->dmpi->stride,
@@ -312,7 +312,7 @@ static void draw_top_blackbar_slice(struct vf_instance_s* vf,
     
 }
 
-static void draw_bottom_blackbar_slice(struct vf_instance_s* vf,
+static void draw_bottom_blackbar_slice(struct vf_instance* vf,
 				    unsigned char** src, int* stride, int w,int h, int x, int y){
     if(vf->priv->exp_y+vf->h<vf->dmpi->h && y+h == vf->h) {
 	unsigned char *src2[MP_MAX_PLANES];
@@ -332,7 +332,7 @@ static void draw_bottom_blackbar_slice(struct vf_instance_s* vf,
     }
 }
 
-static void draw_slice(struct vf_instance_s* vf,
+static void draw_slice(struct vf_instance* vf,
         unsigned char** src, int* stride, int w,int h, int x, int y){
 //    printf("draw_slice() called %d at %d\n",h,y);
     
@@ -355,7 +355,7 @@ static void draw_slice(struct vf_instance_s* vf,
     vf->priv->first_slice = 0;
 }
 
-static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
+static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){
     if (vf->priv->passthrough) {
       mp_image_t *dmpi = vf_get_image(vf->next, IMGFMT_MPEGPES,
                                       MP_IMGTYPE_EXPORT, 0, mpi->w, mpi->h);
@@ -410,7 +410,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
 
 //===========================================================================//
 
-static int control(struct vf_instance_s* vf, int request, void* data){
+static int control(struct vf_instance* vf, int request, void* data){
 #ifdef OSD_SUPPORT
     switch(request){
     case VFCTRL_DRAW_OSD:
@@ -420,7 +420,7 @@ static int control(struct vf_instance_s* vf, int request, void* data){
     return vf_next_control(vf,request,data);
 }
 
-static int query_format(struct vf_instance_s* vf, unsigned int fmt){
+static int query_format(struct vf_instance* vf, unsigned int fmt){
   return (vf_next_query_format(vf,fmt));
 }
 
diff --git a/libmpcodecs/vf_field.c b/libmpcodecs/vf_field.c
index 00e37f0b59..cbbb7bc104 100644
--- a/libmpcodecs/vf_field.c
+++ b/libmpcodecs/vf_field.c
@@ -14,13 +14,13 @@ struct vf_priv_s {
 
 //===========================================================================//
 
-static int config(struct vf_instance_s* vf,
+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/2,d_width,d_height,flags,outfmt);
 }
 
-static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
+static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){
     vf->dmpi=vf_get_image(vf->next,mpi->imgfmt,
 	MP_IMGTYPE_EXPORT, MP_IMGFLAG_ACCEPT_STRIDE,
 	mpi->width, mpi->height/2);
@@ -43,7 +43,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
 
 //===========================================================================//
 
-static void uninit(struct vf_instance_s* vf)
+static void uninit(struct vf_instance* vf)
 {
 	free(vf->priv);
 }
diff --git a/libmpcodecs/vf_fil.c b/libmpcodecs/vf_fil.c
index 7648a92adc..5e36c4774d 100644
--- a/libmpcodecs/vf_fil.c
+++ b/libmpcodecs/vf_fil.c
@@ -17,7 +17,7 @@ struct vf_priv_s {
 
 //===========================================================================//
 
-static int config(struct vf_instance_s* vf,
+static int config(struct vf_instance* vf,
         int width, int height, int d_width, int d_height,
 	unsigned int flags, unsigned int outfmt){
         int pixel_stride= (width+15)&~15; //FIXME this is ust a guess ... especially for non planar its somewhat bad one
@@ -45,7 +45,7 @@ static int config(struct vf_instance_s* vf,
         (d_width*vf->priv->stridefactor)>>1, 2*d_height/vf->priv->stridefactor, flags, outfmt);
 }
 
-static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
+static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){
     if(mpi->flags&MP_IMGFLAG_DIRECT){
 	// we've used DR, so we're ready...
 	return vf_next_put_image(vf,(mp_image_t*)mpi->priv, pts);
@@ -71,7 +71,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
 
 //===========================================================================//
 
-static void uninit(struct vf_instance_s* vf)
+static void uninit(struct vf_instance* vf)
 {
 	free(vf->priv);
 }
diff --git a/libmpcodecs/vf_filmdint.c b/libmpcodecs/vf_filmdint.c
index 2fea3897b1..0b98e22f15 100644
--- a/libmpcodecs/vf_filmdint.c
+++ b/libmpcodecs/vf_filmdint.c
@@ -916,7 +916,7 @@ static inline double get_time(void)
     return tv.tv_sec + tv.tv_usec * 1e-6;
 }
 
-static void get_image(struct vf_instance_s* vf, mp_image_t *mpi)
+static void get_image(struct vf_instance* vf, mp_image_t *mpi)
 {
     struct vf_priv_s *p = vf->priv;
     static unsigned char **planes, planes_idx;
@@ -1120,7 +1120,7 @@ find_breaks(struc