cosmetics: Rename struct vf_instance_s --> vf_instance.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30684 b3059339-0415-0410-9bf9-f77b7e298cf2

91 files changed, 402 insertions, 402 deletions

diff --git a/DOCS/tech/libmpcodecs.txt b/DOCS/tech/libmpcodecs.txt
index 22d29aaf98..3b6f2f261e 100644
--- a/DOCS/tech/libmpcodecs.txt
+++ b/DOCS/tech/libmpcodecs.txt
@@ -153,7 +153,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 algorithm etc.
-    int (*open)(struct vf_instance_s* vf,char* args);
+    int (*open)(struct vf_instance *vf,char* args);
                          // pointer to the open() function:
 
 Sample:
@@ -197,13 +197,13 @@ static int open(vf_instance_t *vf, char* args)
     return 1;
 }
 
-Functions in vf_instance_s:
+Functions in struct vf_instance:
 
 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, unsigned int fmt);
+    int (*query_format)(struct vf_instance *vf, unsigned int fmt);
 
 The query_format() function is called one or more times before the config(),
 to find out the capabilities and/or support status of a given colorspace (fmt).
@@ -216,7 +216,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:
@@ -232,7 +232,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);
 
@@ -257,7 +257,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)
 {
@@ -272,12 +272,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);
 
 Okay, 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, mp_image_t *mpi);
+    int (*put_image)(struct vf_instance *vf, mp_image_t *mpi);
 
 Ah, put_image(). This is the main filter function, it should convert/filter/
 transform the image data from one format/size/color/whatever to another.
@@ -332,7 +332,7 @@ image:
 
 Ok, the rest is for advanced functionality only:
 
-    int (*control)(struct vf_instance_s* vf, int request, void* data);
+    int (*control)(struct vf_instance *vf, int request, void* data);
 
 You can control the filter at runtime from MPlayer/MEncoder/dec_video:
 #define VFCTRL_QUERY_MAX_PP_LEVEL 4 /* test for postprocessing support (max level) */
@@ -343,7 +343,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, mp_image_t *mpi);
+    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.
 It makes in-place pixel modifications possible.
@@ -359,7 +359,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, unsigned char** src,
+    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/libmenu/menu.h b/libmenu/menu.h
index a22dc12abf..1578f5f426 100644
--- a/libmenu/menu.h
+++ b/libmenu/menu.h
@@ -114,6 +114,6 @@ void menu_draw_text_full(mp_image_t* mpi,char* txt,
 
 void menu_draw_box(mp_image_t* mpi, unsigned char grey, unsigned char alpha, int x, int y, int w, int h);
 
-void vf_menu_pause_update(struct vf_instance_s* vf);
+void vf_menu_pause_update(struct vf_instance *vf);
 
 #endif /* MPLAYER_MENU_H */
diff --git a/libmenu/vf_menu.c b/libmenu/vf_menu.c
index 6a49f671af..c1e9eb220b 100644
--- a/libmenu/vf_menu.c
+++ b/libmenu/vf_menu.c
@@ -54,9 +54,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 vo_functions_t *video_out = mpctx_get_video_out(vf->priv->current->ctx);
   if(pause_mpi) {
     put_image(vf,pause_mpi, MP_NOPTS_VALUE);
@@ -120,7 +120,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)) ) {
@@ -137,7 +137,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) {
@@ -213,7 +213,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 CONFIG_FREETYPE
   // here is the right place to get screen dimensions
@@ -227,7 +227,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/vd.c b/libmpcodecs/vd.c
index 6f18ed3308..49acaf9315 100644
--- a/libmpcodecs/vd.c
+++ b/libmpcodecs/vd.c
@@ -368,7 +368,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/ve_lavc.c b/libmpcodecs/ve_lavc.c
index b3e5244bab..0dd725506a 100644
--- a/libmpcodecs/ve_lavc.c
+++ b/libmpcodecs/ve_lavc.c
@@ -345,9 +345,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;
@@ -716,7 +716,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:
@@ -728,7 +728,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:
@@ -765,7 +765,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];
@@ -788,7 +788,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;
@@ -893,7 +893,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 b2d00aebd7..f1e265398e 100644
--- a/libmpcodecs/ve_libdv.c
+++ b/libmpcodecs/ve_libdv.c
@@ -55,7 +55,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){
 
@@ -77,18 +77,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 ab774e97fe..caab62aabe 100644
--- a/libmpcodecs/ve_nuv.c
+++ b/libmpcodecs/ve_nuv.c
@@ -88,7 +88,7 @@ m_option_t nuvopts_conf[]={
 #define COMPDATASIZE (128*4)
 #define FRAMEHEADERSIZE 12
 
-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){
 
@@ -110,17 +110,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){
   uint8_t *header  = vf->priv->buffer;
   uint8_t* data = vf->priv->buffer + FRAMEHEADERSIZE;
   uint8_t* zdata = vf->priv->zbuffer + FRAMEHEADERSIZE;
@@ -201,7 +201,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