Mercurial > mplayer.hg

changeset 30638:a7b908875c14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename open() vf initialization function to vf_open(). This avoids clashes with fcntl.h under certain circumstances.
author diego
date Sun, 21 Feb 2010 13:40:49 +0000
parents 0947ead7e81b
children 102ae81b5dc8
files libmpcodecs/vf.c libmpcodecs/vf.h libmpcodecs/vf_1bpp.c libmpcodecs/vf_2xsai.c libmpcodecs/vf_ass.c libmpcodecs/vf_blackframe.c libmpcodecs/vf_bmovl.c libmpcodecs/vf_boxblur.c libmpcodecs/vf_crop.c libmpcodecs/vf_cropdetect.c libmpcodecs/vf_decimate.c libmpcodecs/vf_delogo.c libmpcodecs/vf_denoise3d.c libmpcodecs/vf_detc.c libmpcodecs/vf_dint.c libmpcodecs/vf_divtc.c libmpcodecs/vf_down3dright.c libmpcodecs/vf_dsize.c libmpcodecs/vf_dvbscale.c libmpcodecs/vf_eq.c libmpcodecs/vf_eq2.c libmpcodecs/vf_expand.c libmpcodecs/vf_field.c libmpcodecs/vf_fil.c libmpcodecs/vf_filmdint.c libmpcodecs/vf_flip.c libmpcodecs/vf_format.c libmpcodecs/vf_framestep.c libmpcodecs/vf_fspp.c libmpcodecs/vf_geq.c libmpcodecs/vf_gradfun.c libmpcodecs/vf_halfpack.c libmpcodecs/vf_harddup.c libmpcodecs/vf_hqdn3d.c libmpcodecs/vf_hue.c libmpcodecs/vf_il.c libmpcodecs/vf_ilpack.c libmpcodecs/vf_ivtc.c libmpcodecs/vf_kerndeint.c libmpcodecs/vf_lavc.c libmpcodecs/vf_lavcdeint.c libmpcodecs/vf_mcdeint.c libmpcodecs/vf_mirror.c libmpcodecs/vf_noformat.c libmpcodecs/vf_noise.c libmpcodecs/vf_ow.c libmpcodecs/vf_palette.c libmpcodecs/vf_perspective.c libmpcodecs/vf_phase.c libmpcodecs/vf_pp.c libmpcodecs/vf_pp7.c libmpcodecs/vf_pullup.c libmpcodecs/vf_qp.c libmpcodecs/vf_rectangle.c libmpcodecs/vf_remove_logo.c libmpcodecs/vf_rgb2bgr.c libmpcodecs/vf_rgbtest.c libmpcodecs/vf_rotate.c libmpcodecs/vf_sab.c libmpcodecs/vf_scale.c libmpcodecs/vf_screenshot.c libmpcodecs/vf_smartblur.c libmpcodecs/vf_softpulldown.c libmpcodecs/vf_softskip.c libmpcodecs/vf_spp.c libmpcodecs/vf_swapuv.c libmpcodecs/vf_telecine.c libmpcodecs/vf_test.c libmpcodecs/vf_tfields.c libmpcodecs/vf_tile.c libmpcodecs/vf_tinterlace.c libmpcodecs/vf_unsharp.c libmpcodecs/vf_uspp.c libmpcodecs/vf_vo.c libmpcodecs/vf_yadif.c libmpcodecs/vf_yuvcsp.c libmpcodecs/vf_yuy2.c libmpcodecs/vf_yvu9.c libmpcodecs/vf_zrmjpeg.c
diffstat 79 files changed, 157 insertions(+), 158 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/vf.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf.c	Sun Feb 21 13:40:49 2010 +0000
@@ -464,7 +464,7 @@
 	args = (char**)args[1];
       else
 	args = NULL;
-    if(vf->info->open(vf,(char*)args)>0) return vf; // Success!
+    if(vf->info->vf_open(vf,(char*)args)>0) return vf; // Success!
     free(vf);
     mp_msg(MSGT_VFILTER,MSGL_ERR,MSGTR_CouldNotOpenVideoFilter,name);
     return NULL;
--- a/libmpcodecs/vf.h	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf.h	Sun Feb 21 13:40:49 2010 +0000
@@ -29,7 +29,7 @@
     const char *name;
     const char *author;
     const char *comment;
-    int (*open)(struct vf_instance_s* vf,char* args);
+    int (*vf_open)(struct vf_instance_s* vf,char* args);
     // Ptr to a struct dscribing the options
     const void* opts;
 } vf_info_t;
--- a/libmpcodecs/vf_1bpp.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_1bpp.c	Sun Feb 21 13:40:49 2010 +0000
@@ -180,7 +180,7 @@
     return vf->next->query_format(vf->next,best);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->query_format=query_format;
@@ -194,7 +194,7 @@
     "1bpp",
     "A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_2xsai.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_2xsai.c	Sun Feb 21 13:40:49 2010 +0000
@@ -317,7 +317,7 @@
     return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->query_format=query_format;
@@ -329,7 +329,7 @@
     "2xsai",
     "A'rpi",
     "http://elektron.its.tudelft.nl/~dalikifa/",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_ass.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_ass.c	Sun Feb 21 13:40:49 2010 +0000
@@ -388,7 +388,7 @@
 	0
 };
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	int flags;
 	vf->priv->outfmt = vf_match_csp(&vf->next,fmt_list,IMGFMT_YV12);
@@ -431,6 +431,6 @@
 	"ass",
 	"Evgeniy Stepanov",
 	"",
-	open,
+	vf_open,
 	&vf_opts
 };
--- a/libmpcodecs/vf_blackframe.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_blackframe.c	Sun Feb 21 13:40:49 2010 +0000
@@ -118,7 +118,7 @@
     if (vf->priv) free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->priv = malloc(sizeof(struct vf_priv_s));
     if (!vf->priv) return 0;
 
@@ -143,6 +143,6 @@
     "blackframe",
     "Brian J. Murrell, Julian Hall, Ivo van Poorten",
     "Useful for detecting scene transitions",
-    open,
+    vf_open,
     NULL
 };
--- a/libmpcodecs/vf_bmovl.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_bmovl.c	Sun Feb 21 13:40:49 2010 +0000
@@ -458,7 +458,7 @@
 } // put_image
 
 static int
-vf_open(vf_instance_t* vf, char* args)
+vf_open(vf_instance_t *vf, char *args)
 {
     char filename[1000];
 
--- a/libmpcodecs/vf_boxblur.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_boxblur.c	Sun Feb 21 13:40:49 2010 +0000
@@ -171,7 +171,7 @@
 	return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
 	int e;
 
 	vf->config=config;
@@ -207,7 +207,7 @@
     "boxblur",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_crop.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_crop.c	Sun Feb 21 13:40:49 2010 +0000
@@ -156,7 +156,7 @@
 
 //===========================================================================//
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->start_slice=start_slice;
@@ -191,7 +191,7 @@
     "crop",
     "A'rpi",
     "",
-    open,
+    vf_open,
     &vf_opts
 };
 
--- a/libmpcodecs/vf_cropdetect.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_cropdetect.c	Sun Feb 21 13:40:49 2010 +0000
@@ -174,7 +174,7 @@
 }
 //===========================================================================//
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->query_format=query_format;
@@ -194,7 +194,7 @@
     "cropdetect",
     "A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_decimate.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_decimate.c	Sun Feb 21 13:40:49 2010 +0000
@@ -169,7 +169,7 @@
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	struct vf_priv_s *p;
 	vf->put_image = put_image;
@@ -193,6 +193,6 @@
     "decimate",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };
--- a/libmpcodecs/vf_delogo.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_delogo.c	Sun Feb 21 13:40:49 2010 +0000
@@ -196,7 +196,7 @@
     0
 };
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->get_image=get_image;
@@ -255,7 +255,7 @@
     "delogo",
     "Jindrich Makovicka, Alex Beregszaszi",
     "",
-    open,
+    vf_open,
     &vf_opts
 };
 
--- a/libmpcodecs/vf_denoise3d.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_denoise3d.c	Sun Feb 21 13:40:49 2010 +0000
@@ -182,7 +182,7 @@
 }
 
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
         double LumSpac, LumTmp, ChromSpac, ChromTmp;
         double Param1, Param2, Param3;
 
@@ -261,7 +261,7 @@
     "denoise3d",
     "Daniel Moreno",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_detc.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_detc.c	Sun Feb 21 13:40:49 2010 +0000
@@ -420,7 +420,7 @@
 	free(orig);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	struct vf_priv_s *p;
 	vf->config = config;
@@ -448,6 +448,6 @@
     "detc",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };
--- a/libmpcodecs/vf_dint.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_dint.c	Sun Feb 21 13:40:49 2010 +0000
@@ -191,7 +191,7 @@
     return vf_next_put_image (vf, mpi, pts);
 }
 
-static int open (vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config = config;
     vf->put_image = put_image;
 //    vf->default_reqs=VFCAP_ACCEPT_STRIDE;
@@ -209,6 +209,6 @@
     "dint",
     "A.G.",
     "",
-    open,
+    vf_open,
     NULL
 };
--- a/libmpcodecs/vf_divtc.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_divtc.c	Sun Feb 21 13:40:49 2010 +0000
@@ -595,7 +595,7 @@
       }
    }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
    {
    struct vf_priv_s *p;
    char *filename="framediff.log", *ap, *q, *a;
@@ -715,6 +715,6 @@
    "divtc",
    "Ville Saari",
    "",
-   open,
+   vf_open,
    NULL
    };
--- a/libmpcodecs/vf_down3dright.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_down3dright.c	Sun Feb 21 13:40:49 2010 +0000
@@ -140,7 +140,7 @@
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	vf->config=config;
 	vf->query_format=query_format;
@@ -161,6 +161,6 @@
 	"down3dright",
 	"Zdenek Kabelac",
 	"",
-	open,
+	vf_open,
 	NULL
 };
--- a/libmpcodecs/vf_dsize.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_dsize.c	Sun Feb 21 13:40:49 2010 +0000
@@ -79,7 +79,7 @@
 	vf->priv = NULL;
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	vf->config = config;
 	vf->draw_slice = vf_next_draw_slice;
@@ -118,6 +118,6 @@
     "dsize",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };
--- a/libmpcodecs/vf_dvbscale.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_dvbscale.c	Sun Feb 21 13:40:49 2010 +0000
@@ -46,7 +46,7 @@
     return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->default_caps=0;
     vf->priv=malloc(sizeof(struct vf_priv_s));
@@ -60,7 +60,7 @@
     "dvbscale",
     "A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_eq.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_eq.c	Sun Feb 21 13:40:49 2010 +0000
@@ -219,7 +219,7 @@
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	vf->control=control;
 	vf->query_format=query_format;
@@ -253,6 +253,6 @@
 	"eq",
 	"Richard Felker",
 	"",
-	open,
+	vf_open,
 	&vf_opts
 };
--- a/libmpcodecs/vf_eq2.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_eq2.c	Sun Feb 21 13:40:49 2010 +0000
@@ -446,7 +446,7 @@
 }
 
 static
-int open (vf_instance_t *vf, char *args)
+int vf_open(vf_instance_t *vf, char *args)
 {
   unsigned i;
   vf_eq2_t *eq2;
@@ -514,6 +514,6 @@
   "eq2",
   "Hampa Hug, Daniel Moreno, Richard Felker",
   "",
-  &open,
+  &vf_open,
   NULL
 };
--- a/libmpcodecs/vf_expand.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_expand.c	Sun Feb 21 13:40:49 2010 +0000
@@ -452,7 +452,7 @@
   return vf_next_query_format(vf,fmt);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->control=control;
     vf->query_format=query_format;
@@ -501,7 +501,7 @@
     "expand",
     "A'rpi",
     "",
-    open,
+    vf_open,
     &vf_opts
 };
 
--- a/libmpcodecs/vf_field.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_field.c	Sun Feb 21 13:40:49 2010 +0000
@@ -66,7 +66,7 @@
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->uninit=uninit;
@@ -82,7 +82,7 @@
     "field",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_fil.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_fil.c	Sun Feb 21 13:40:49 2010 +0000
@@ -94,7 +94,7 @@
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->uninit=uninit;
@@ -109,7 +109,7 @@
     "fil",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_filmdint.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_filmdint.c	Sun Feb 21 13:40:49 2010 +0000
@@ -1406,7 +1406,7 @@
     free(p);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
     struct vf_priv_s *p;
     vf->get_image = get_image;
@@ -1458,6 +1458,6 @@
     "filmdint",
     "Zoltan Hidvegi",
     "",
-    open,
+    vf_open,
     NULL
 };
--- a/libmpcodecs/vf_flip.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_flip.c	Sun Feb 21 13:40:49 2010 +0000
@@ -90,7 +90,7 @@
 
 //===========================================================================//
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->get_image=get_image;
     vf->put_image=put_image;
@@ -103,7 +103,7 @@
     "flip",
     "A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_format.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_format.c	Sun Feb 21 13:40:49 2010 +0000
@@ -46,7 +46,7 @@
     return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->query_format=query_format;
     vf->default_caps=0;
     return 1;
@@ -70,7 +70,7 @@
     "format",
     "A'rpi",
     "FIXME! get_image()/put_image()",
-    open,
+    vf_open,
     &vf_opts
 };
 
--- a/libmpcodecs/vf_framestep.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_framestep.c	Sun Feb 21 13:40:49 2010 +0000
@@ -153,7 +153,7 @@
 }
 
 /* Main entry funct for the filter */
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	struct vf_priv_s *p;
 
@@ -200,6 +200,6 @@
     "framestep",
     "Daniele Forghieri",
     "",
-    open,
+    vf_open,
     NULL
 };
--- a/libmpcodecs/vf_fspp.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_fspp.c	Sun Feb 21 13:40:49 2010 +0000
@@ -622,7 +622,7 @@
     return vf_next_control(vf,request,data);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
     int i=0, bias;
     int custom_threshold_m[64];
@@ -683,7 +683,7 @@
     "fspp",
     "Michael Niedermayer, Nikolaj Poroshin",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_geq.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_geq.c	Sun Feb 21 13:40:49 2010 +0000
@@ -134,7 +134,7 @@
 }
 
 //===========================================================================//
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     char eq[3][2000] = { { 0 }, { 0 }, { 0 } };
     int plane;
 
@@ -193,6 +193,6 @@
     "geq",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
--- a/libmpcodecs/vf_gradfun.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_gradfun.c	Sun Feb 21 13:40:49 2010 +0000
@@ -364,7 +364,7 @@
     vf->priv = NULL;
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
     float thresh = 1.2;
     int radius = 16;
@@ -402,6 +402,6 @@
     "gradfun",
     "Loren Merritt",
     "",
-    open,
+    vf_open,
     NULL
 };
--- a/libmpcodecs/vf_halfpack.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_halfpack.c	Sun Feb 21 13:40:49 2010 +0000
@@ -226,7 +226,7 @@
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	vf->config=config;
 	vf->query_format=query_format;
@@ -249,6 +249,6 @@
 	"halfpack",
 	"Richard Felker",
 	"",
-	open,
+	vf_open,
 	NULL
 };
--- a/libmpcodecs/vf_harddup.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_harddup.c	Sun Feb 21 13:40:49 2010 +0000
@@ -73,7 +73,7 @@
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	vf->put_image = put_image;
 	vf->control = control;
@@ -87,6 +87,6 @@
     "harddup",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };
--- a/libmpcodecs/vf_hqdn3d.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_hqdn3d.c	Sun Feb 21 13:40:49 2010 +0000
@@ -273,7 +273,7 @@
 }
 
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
         double LumSpac, LumTmp, ChromSpac, ChromTmp;
         double Param1, Param2, Param3, Param4;
 
@@ -360,7 +360,7 @@
     "hqdn3d",
     "Daniel Moreno & A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_hue.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_hue.c	Sun Feb 21 13:40:49 2010 +0000
@@ -163,7 +163,7 @@
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	vf->control=control;
 	vf->query_format=query_format;
@@ -195,6 +195,6 @@
 	"hue",
 	"Michael Niedermayer",
 	"",
-	open,
+	vf_open,
 	&vf_opts
 };
--- a/libmpcodecs/vf_il.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_il.c	Sun Feb 21 13:40:49 2010 +0000
@@ -119,7 +119,7 @@
 	if(pos && pos<max) fp->interleave=-1;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
 
 	vf->put_image=put_image;
 //	vf->get_image=get_image;
@@ -141,7 +141,7 @@
     "il",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_ilpack.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_ilpack.c	Sun Feb 21 13:40:49 2010 +0000
@@ -404,7 +404,7 @@
 	return 0;
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	vf->config=config;
 	vf->query_format=query_format;
@@ -448,6 +448,6 @@
 	"ilpack",
 	"Richard Felker",
 	"",
-	open,
+	vf_open,
 	NULL
 };
--- a/libmpcodecs/vf_ivtc.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_ivtc.c	Sun Feb 21 13:40:49 2010 +0000
@@ -522,7 +522,7 @@
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	struct vf_priv_s *p;
 	vf->put_image = put_image;
@@ -545,6 +545,6 @@
     "ivtc",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };
--- a/libmpcodecs/vf_kerndeint.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_kerndeint.c	Sun Feb 21 13:40:49 2010 +0000
@@ -302,7 +302,7 @@
 	return vf_next_control (vf, request, data);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
 
 	vf->control=control;
 	vf->config=config;
@@ -338,7 +338,7 @@
     "kerndeint",
     "Donald Graft",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_lavc.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_lavc.c	Sun Feb 21 13:40:49 2010 +0000
@@ -130,7 +130,7 @@
     return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     int p_quality=0;
     float p_fps=0;
 
@@ -180,7 +180,7 @@
     "lavc",
     "A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_lavcdeint.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_lavcdeint.c	Sun Feb 21 13:40:49 2010 +0000
@@ -161,7 +161,7 @@
 
 
 static int
-open (vf_instance_t *vf, char* args)
+vf_open(vf_instance_t *vf, char *args)
 {
   /* We don't have any args */
   (void) args;
@@ -192,7 +192,7 @@
     "Joe Rabinoff",
     "libavcodec's internal deinterlacer, in case you don't like "
       "the builtin ones (invoked with -pp or -npp)",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_mcdeint.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_mcdeint.c	Sun Feb 21 13:40:49 2010 +0000
@@ -306,7 +306,7 @@
     return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
 
     vf->config=config;
     vf->put_image=put_image;
@@ -333,6 +333,6 @@
     "mcdeint",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
--- a/libmpcodecs/vf_mirror.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_mirror.c	Sun Feb 21 13:40:49 2010 +0000
@@ -113,7 +113,7 @@
 
 //===========================================================================//
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     //vf->config=config;
     vf->put_image=put_image;
     return 1;
@@ -124,7 +124,7 @@
     "mirror",
     "Eyck",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_noformat.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_noformat.c	Sun Feb 21 13:40:49 2010 +0000
@@ -46,7 +46,7 @@
     return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->query_format=query_format;
     vf->default_caps=0;
     return 1;
@@ -70,7 +70,7 @@
     "noformat",
     "Joey",
     "",
-    open,
+    vf_open,
     &vf_opts
 };
 
--- a/libmpcodecs/vf_noise.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_noise.c	Sun Feb 21 13:40:49 2010 +0000
@@ -423,7 +423,7 @@
     0
 };
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->get_image=get_image;
@@ -466,7 +466,7 @@
     "noise",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_ow.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_ow.c	Sun Feb 21 13:40:49 2010 +0000
@@ -289,7 +289,7 @@
 }
 
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->get_image=get_image;
@@ -317,6 +317,6 @@
     "ow",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
--- a/libmpcodecs/vf_palette.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_palette.c	Sun Feb 21 13:40:49 2010 +0000
@@ -188,7 +188,7 @@
   free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     unsigned int i;
     vf->config=config;
     vf->uninit=uninit;
@@ -220,7 +220,7 @@
     "palette",
     "A'rpi & Alex",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_perspective.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_perspective.c	Sun Feb 21 13:40:49 2010 +0000
@@ -304,7 +304,7 @@
 	return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
 	int e;
 
 	vf->config=config;
@@ -336,7 +336,7 @@
     "perspective",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_phase.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_phase.c	Sun Feb 21 13:40:49 2010 +0000
@@ -248,7 +248,7 @@
    free(vf->priv);
    }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
    {
    vf->put_image = put_image;
    vf->uninit = uninit;
@@ -296,6 +296,6 @@
    "phase",
    "Ville Saari",
    "",
-   open,
+   vf_open,
    NULL
    };
--- a/libmpcodecs/vf_pp.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_pp.c	Sun Feb 21 13:40:49 2010 +0000
@@ -169,7 +169,7 @@
     0
 };
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     char *endptr, *name;
     int i;
     int hex_mode=0;
@@ -237,7 +237,7 @@
     "pp",
     "A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_pp7.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_pp7.c	Sun Feb 21 13:40:49 2010 +0000
@@ -440,7 +440,7 @@
     return vf_next_control(vf,request,data);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->get_image=get_image;
@@ -486,6 +486,6 @@
     "pp7",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
--- a/libmpcodecs/vf_pullup.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_pullup.c	Sun Feb 21 13:40:49 2010 +0000
@@ -280,7 +280,7 @@
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	struct vf_priv_s *p;
 	struct pullup_context *c;
@@ -309,6 +309,6 @@
     "pullup",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };
--- a/libmpcodecs/vf_qp.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_qp.c	Sun Feb 21 13:40:49 2010 +0000
@@ -147,7 +147,7 @@
 }
 
 //===========================================================================//
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->get_image=get_image;
@@ -167,6 +167,6 @@
     "qp",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
--- a/libmpcodecs/vf_rectangle.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_rectangle.c	Sun Feb 21 13:40:49 2010 +0000
@@ -156,7 +156,7 @@
 }
 
 static int
-open(vf_instance_t* vf, char* args) {
+vf_open(vf_instance_t *vf, char *args) {
     vf->config = config;
     vf->control = control;
     vf->put_image = put_image;
@@ -176,6 +176,6 @@
     "rectangle",
     "Kim Minh Kaplan",
     "",
-    open,
+    vf_open,
     NULL
 };
--- a/libmpcodecs/vf_remove_logo.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_remove_logo.c	Sun Feb 21 13:40:49 2010 +0000
@@ -828,7 +828,7 @@
  *
  * This sets up our instance variables and parses the arguments to the filter.
  */
-static int open(vf_instance_t * vf, char * args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
   vf->priv = safe_malloc(sizeof(vf_priv_s));
 
@@ -898,7 +898,7 @@
     "remove-logo",
     "Robert Edele",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_rgb2bgr.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_rgb2bgr.c	Sun Feb 21 13:40:49 2010 +0000
@@ -100,7 +100,7 @@
     return vf_next_query_format(vf,fmt) & (~VFCAP_CSP_SUPPORTED_BY_HW);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->query_format=query_format;
@@ -114,7 +114,7 @@
     "rgb2bgr",
     "A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_rgbtest.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_rgbtest.c	Sun Feb 21 13:40:49 2010 +0000
@@ -140,7 +140,7 @@
     return vf_next_query_format(vf,fmt) & (~VFCAP_CSP_SUPPORTED_BY_HW);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->query_format=query_format;
@@ -156,7 +156,7 @@
     "rgbtest",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_rotate.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_rotate.c	Sun Feb 21 13:40:49 2010 +0000
@@ -131,7 +131,7 @@
     return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->query_format=query_format;
@@ -145,7 +145,7 @@
     "rotate",
     "A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_sab.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_sab.c	Sun Feb 21 13:40:49 2010 +0000
@@ -272,7 +272,7 @@
 	return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
 	int e;
 
 	vf->config=config;
@@ -314,7 +314,7 @@
     "sab",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_scale.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_scale.c	Sun Feb 21 13:40:49 2010 +0000
@@ -563,7 +563,7 @@
     free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->start_slice=start_slice;
     vf->draw_slice=draw_slice;
@@ -724,7 +724,7 @@
     "scale",
     "A'rpi",
     "",
-    open,
+    vf_open,
     &vf_opts
 };
 
--- a/libmpcodecs/vf_screenshot.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_screenshot.c	Sun Feb 21 13:40:49 2010 +0000
@@ -282,8 +282,7 @@
     free(vf->priv);
 }
 
-// open conflicts with stdio.h at least under MinGW
-static int screenshot_open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
     vf->config=config;
     vf->control=control;
@@ -315,7 +314,7 @@
     "screenshot",
     "A'rpi, Jindrich Makovicka",
     "",
-    screenshot_open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_smartblur.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_smartblur.c	Sun Feb 21 13:40:49 2010 +0000
@@ -216,7 +216,7 @@
 	return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
 	int e;
 
 	vf->config=config;
@@ -255,7 +255,7 @@
     "smartblur",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_softpulldown.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_softpulldown.c	Sun Feb 21 13:40:49 2010 +0000
@@ -142,7 +142,7 @@
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	struct vf_priv_s *p;
 	vf->config = config;
@@ -159,6 +159,6 @@
     "softpulldown",
     "Tobias Diedrich <ranma+mplayer@tdiedrich.de>",
     "",
-    open,
+    vf_open,
     NULL
 };
--- a/libmpcodecs/vf_softskip.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_softskip.c	Sun Feb 21 13:40:49 2010 +0000
@@ -83,7 +83,7 @@
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	vf->put_image = put_image;
 	vf->control = control;
@@ -97,6 +97,6 @@
     "softskip",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };
--- a/libmpcodecs/vf_spp.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_spp.c	Sun Feb 21 13:40:49 2010 +0000
@@ -562,7 +562,7 @@
     return vf_next_control(vf,request,data);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
 
     int log2c=-1;
 
@@ -614,6 +614,6 @@
     "spp",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
--- a/libmpcodecs/vf_swapuv.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_swapuv.c	Sun Feb 21 13:40:49 2010 +0000
@@ -87,7 +87,7 @@
 	return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->put_image=put_image;
     vf->get_image=get_image;
     vf->query_format=query_format;
@@ -99,7 +99,7 @@
     "swapuv",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_telecine.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_telecine.c	Sun Feb 21 13:40:49 2010 +0000
@@ -131,7 +131,7 @@
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	//vf->config = config;
 	vf->put_image = put_image;
@@ -150,6 +150,6 @@
     "telecine",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };
--- a/libmpcodecs/vf_test.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_test.c	Sun Feb 21 13:40:49 2010 +0000
@@ -311,7 +311,7 @@
     return vf_next_query_format(vf,IMGFMT_YV12) & (~VFCAP_CSP_SUPPORTED_BY_HW);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->query_format=query_format;
@@ -326,7 +326,7 @@
     "test",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_tfields.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_tfields.c	Sun Feb 21 13:40:49 2010 +0000
@@ -496,7 +496,7 @@
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	struct vf_priv_s *p;
 	vf->config = config;
@@ -530,6 +530,6 @@
     "tfields",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };
--- a/libmpcodecs/vf_tile.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_tile.c	Sun Feb 21 13:40:49 2010 +0000
@@ -231,7 +231,7 @@
  * If the value is less then 0 def_val is used.
  * Return 0 for ok
  *
- * Look below ( in open(...) ) for a use ...
+ * Look below ( in vf_open(...) ) for a use ...
  */
 static int parse_int(char **s, int *rt, int def_val)
 {
@@ -266,7 +266,7 @@
 }
 
 /* Main entry funct for the filter */
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
     struct vf_priv_s *p;
     int              er;
@@ -323,6 +323,6 @@
     "tile",
     "Daniele Forghieri",
     "",
-    open,
+    vf_open,
     NULL
 };
--- a/libmpcodecs/vf_tinterlace.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_tinterlace.c	Sun Feb 21 13:40:49 2010 +0000
@@ -209,7 +209,7 @@
 	free(vf->priv);
 }
 
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
 {
 	struct vf_priv_s *p;
 	vf->config = config;
@@ -230,6 +230,6 @@
 	"tinterlace",
 	"Michael Zucchi",
 	"",
-	open,
+	vf_open,
 	NULL
 };
--- a/libmpcodecs/vf_unsharp.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_unsharp.c	Sun Feb 21 13:40:49 2010 +0000
@@ -270,7 +270,7 @@
     0
 };
 
-static int open( vf_instance_t *vf, char* args ) {
+static int vf_open( vf_instance_t *vf, char *args ) {
     vf->config       = config;
     vf->put_image    = put_image;
     vf->get_image    = get_image;
@@ -317,7 +317,7 @@
     "unsharp",
     "Remi Guyomarch",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_uspp.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_uspp.c	Sun Feb 21 13:40:49 2010 +0000
@@ -340,7 +340,7 @@
     return vf_next_control(vf,request,data);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
 
     int log2c=-1;
 
@@ -380,6 +380,6 @@
     "uspp",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
--- a/libmpcodecs/vf_vo.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_vo.c	Sun Feb 21 13:40:49 2010 +0000
@@ -239,7 +239,7 @@
 }
 //===========================================================================//
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->control=control;
     vf->query_format=query_format;
@@ -260,7 +260,7 @@
     "vo",
     "A'rpi",
     "for internal use",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_yadif.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_yadif.c	Sun Feb 21 13:40:49 2010 +0000
@@ -479,7 +479,7 @@
     return vf_next_control (vf, request, data);
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
 
     vf->config=config;
     vf->put_image=put_image;
@@ -508,6 +508,6 @@
     "yadif",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
--- a/libmpcodecs/vf_yuvcsp.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_yuvcsp.c	Sun Feb 21 13:40:49 2010 +0000
@@ -97,7 +97,7 @@
     return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
 //    vf->uninit=uninit;
@@ -113,7 +113,7 @@
     "yuvcsp",
     "Alex Beregszaszi",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_yuy2.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_yuy2.c	Sun Feb 21 13:40:49 2010 +0000
@@ -81,7 +81,7 @@
     return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->query_format=query_format;
@@ -93,7 +93,7 @@
     "yuy2",
     "A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_yvu9.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_yvu9.c	Sun Feb 21 13:40:49 2010 +0000
@@ -86,7 +86,7 @@
     return 0;
 }
 
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
     vf->config=config;
     vf->put_image=put_image;
     vf->query_format=query_format;
@@ -98,7 +98,7 @@
     "yvu9",
     "alex",
     "",
-    open,
+    vf_open,
     NULL
 };
 
--- a/libmpcodecs/vf_zrmjpeg.c	Sun Feb 21 13:38:55 2010 +0000
+++ b/libmpcodecs/vf_zrmjpeg.c	Sun Feb 21 13:40:49 2010 +0000
@@ -893,9 +893,9 @@
  * This routine will do some basic initialization of local structures etc.,
  * and then parse the command line arguments specific for the ZRMJPEG filter.
  */
-static int open(vf_instance_t *vf, char* args){
+static int vf_open(vf_instance_t *vf, char *args){
 	struct vf_priv_s *priv;
-	VERBOSE("open() called: args=\"%s\"\n", args);
+	VERBOSE("vf_open() called: args=\"%s\"\n", args);
 
 	vf->config = config;
 	vf->put_image = put_image;
@@ -1062,6 +1062,6 @@
     "zrmjpeg",
     "Rik Snel",
     "",
-    open,
+    vf_open,
     NULL
 };