Rename open() vf initialization function to vf_open().

This avoids clashes with fcntl.h under certain circumstances.


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

libmpcodecs/vf.c

@@ -464,7 +464,7 @@ vf_instance_t* vf_open_plugin(const vf_info_t* const* filter_list, vf_instance_t
 	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;

libmpcodecs/vf.h

@@ -29,7 +29,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 (*vf_open)(struct vf_instance_s* vf,char* args);
     // Ptr to a struct dscribing the options
     const void* opts;
 } vf_info_t;

libmpcodecs/vf_1bpp.c

@@ -180,7 +180,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){
     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 @@ const vf_info_t vf_info_1bpp = {
     "1bpp",
     "A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_2xsai.c

@@ -317,7 +317,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){
     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 @@ const vf_info_t vf_info_2xsai = {
     "2xsai",
     "A'rpi",
     "http://elektron.its.tudelft.nl/~dalikifa/",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_ass.c

@@ -388,7 +388,7 @@ static const unsigned int fmt_list[]={
 	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 @@ const vf_info_t vf_info_ass = {
 	"ass",
 	"Evgeniy Stepanov",
 	"",
-	open,
+	vf_open,
 	&vf_opts
 };

libmpcodecs/vf_blackframe.c

@@ -118,7 +118,7 @@ static void uninit(struct vf_instance_s *vf) {
     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 @@ const vf_info_t vf_info_blackframe = {
     "blackframe",
     "Brian J. Murrell, Julian Hall, Ivo van Poorten",
     "Useful for detecting scene transitions",
-    open,
+    vf_open,
     NULL
 };

libmpcodecs/vf_bmovl.c

@@ -458,7 +458,7 @@ put_image(struct vf_instance_s* vf, mp_image_t* mpi, double pts){
 } // put_image
 
 static int
-vf_open(vf_instance_t* vf, char* args)
+vf_open(vf_instance_t *vf, char *args)
 {
     char filename[1000];
 

libmpcodecs/vf_boxblur.c

@@ -171,7 +171,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){
 	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 @@ const vf_info_t vf_info_boxblur = {
     "boxblur",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_crop.c

@@ -156,7 +156,7 @@ static void draw_slice(struct vf_instance_s* vf,
 
 //===========================================================================//
 
-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 @@ const vf_info_t vf_info_crop = {
     "crop",
     "A'rpi",
     "",
-    open,
+    vf_open,
     &vf_opts
 };
 

libmpcodecs/vf_cropdetect.c

@@ -174,7 +174,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt) {
 }
 //===========================================================================//
 
-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 @@ const vf_info_t vf_info_cropdetect = {
     "cropdetect",
     "A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_decimate.c

@@ -169,7 +169,7 @@ static void uninit(struct vf_instance_s* vf)
 	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 @@ const vf_info_t vf_info_decimate = {
     "decimate",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };

libmpcodecs/vf_delogo.c

@@ -196,7 +196,7 @@ static unsigned int fmt_list[]={
     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 @@ const vf_info_t vf_info_delogo = {
     "delogo",
     "Jindrich Makovicka, Alex Beregszaszi",
     "",
-    open,
+    vf_open,
     &vf_opts
 };
 

libmpcodecs/vf_denoise3d.c

@@ -182,7 +182,7 @@ static void PrecalcCoefs(int *Ct, double Dist25)
 }
 
 
-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 @@ const vf_info_t vf_info_denoise3d = {
     "denoise3d",
     "Daniel Moreno",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_detc.c

@@ -420,7 +420,7 @@ static void parse_args(struct vf_priv_s *p, char *args)
 	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 @@ const vf_info_t vf_info_detc = {
     "detc",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };

libmpcodecs/vf_dint.c

@@ -191,7 +191,7 @@ static int put_image (struct vf_instance_s* vf, mp_image_t *mpi, double pts)
     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 @@ const vf_info_t vf_info_dint = {
     "dint",
     "A.G.",
     "",
-    open,
+    vf_open,
     NULL
 };

libmpcodecs/vf_divtc.c

@@ -595,7 +595,7 @@ static void uninit(struct vf_instance_s* vf)
       }
    }
 
-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 @@ const vf_info_t vf_info_divtc =
    "divtc",
    "Ville Saari",
    "",
-   open,
+   vf_open,
    NULL
    };

libmpcodecs/vf_down3dright.c

@@ -140,7 +140,7 @@ static void uninit(struct vf_instance_s* vf)
 	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 @@ const vf_info_t vf_info_down3dright = {
 	"down3dright",
 	"Zdenek Kabelac",
 	"",
-	open,
+	vf_open,
 	NULL
 };

libmpcodecs/vf_dsize.c

@@ -79,7 +79,7 @@ static void uninit(vf_instance_t *vf) {
 	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 @@ const vf_info_t vf_info_dsize = {
     "dsize",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };

libmpcodecs/vf_dvbscale.c

@@ -46,7 +46,7 @@ static int config(struct vf_instance_s* vf,
     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 @@ const vf_info_t vf_info_dvbscale = {
     "dvbscale",
     "A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_eq.c

@@ -219,7 +219,7 @@ static void uninit(struct vf_instance_s* vf)
 	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 @@ const vf_info_t vf_info_eq = {
 	"eq",
 	"Richard Felker",
 	"",
-	open,
+	vf_open,
 	&vf_opts
 };

libmpcodecs/vf_eq2.c

@@ -446,7 +446,7 @@ void uninit (vf_instance_t *vf)
 }
 
 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 @@ const vf_info_t vf_info_eq2 = {
   "eq2",
   "Hampa Hug, Daniel Moreno, Richard Felker",
   "",
-  &open,
+  &vf_open,
   NULL
 };

libmpcodecs/vf_expand.c

@@ -452,7 +452,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){
   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 @@ const vf_info_t vf_info_expand = {
     "expand",
     "A'rpi",
     "",
-    open,
+    vf_open,
     &vf_opts
 };
 

libmpcodecs/vf_field.c

@@ -66,7 +66,7 @@ static void uninit(struct vf_instance_s* vf)
 	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 @@ const vf_info_t vf_info_field = {
     "field",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_fil.c

@@ -94,7 +94,7 @@ static void uninit(struct vf_instance_s* vf)
 	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 @@ const vf_info_t vf_info_fil = {
     "fil",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_filmdint.c

@@ -1406,7 +1406,7 @@ static void uninit(struct vf_instance_s* vf)
     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 @@ const vf_info_t vf_info_filmdint = {
     "filmdint",
     "Zoltan Hidvegi",
     "",
-    open,
+    vf_open,
     NULL
 };

libmpcodecs/vf_flip.c

@@ -90,7 +90,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
 
 //===========================================================================//
 
-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 @@ const vf_info_t vf_info_flip = {
     "flip",
     "A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_format.c

@@ -46,7 +46,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){
     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 @@ const vf_info_t vf_info_format = {
     "format",
     "A'rpi",
     "FIXME! get_image()/put_image()",
-    open,
+    vf_open,
     &vf_opts
 };
 

libmpcodecs/vf_framestep.c

@@ -153,7 +153,7 @@ static void uninit(struct vf_instance_s* vf)
 }
 
 /* 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 @@ const vf_info_t vf_info_framestep = {
     "framestep",
     "Daniele Forghieri",
     "",
-    open,
+    vf_open,
     NULL
 };

libmpcodecs/vf_fspp.c

@@ -622,7 +622,7 @@ static int control(struct vf_instance_s* vf, int request, void* data)
     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 @@ const vf_info_t vf_info_fspp = {
     "fspp",
     "Michael Niedermayer, Nikolaj Poroshin",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_geq.c

@@ -134,7 +134,7 @@ static void uninit(struct vf_instance_s* vf){
 }
 
 //===========================================================================//
-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 @@ const vf_info_t vf_info_geq = {
     "geq",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };

libmpcodecs/vf_gradfun.c

@@ -364,7 +364,7 @@ static void uninit(struct vf_instance_s* vf)
     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 @@ const vf_info_t vf_info_gradfun = {
     "gradfun",
     "Loren Merritt",
     "",
-    open,
+    vf_open,
     NULL
 };

libmpcodecs/vf_halfpack.c

@@ -226,7 +226,7 @@ static void uninit(struct vf_instance_s* vf)
 	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 @@ const vf_info_t vf_info_halfpack = {
 	"halfpack",
 	"Richard Felker",
 	"",
-	open,
+	vf_open,
 	NULL
 };

libmpcodecs/vf_harddup.c

@@ -73,7 +73,7 @@ static void uninit(struct vf_instance_s* vf)
 	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 @@ const vf_info_t vf_info_harddup = {
     "harddup",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };

libmpcodecs/vf_hqdn3d.c

@@ -273,7 +273,7 @@ static void PrecalcCoefs(int *Ct, double Dist25)
 }
 
 
-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 @@ const vf_info_t vf_info_hqdn3d = {
     "hqdn3d",
     "Daniel Moreno & A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_hue.c

@@ -163,7 +163,7 @@ static void uninit(struct vf_instance_s* vf)
 	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 @@ const vf_info_t vf_info_hue = {
 	"hue",
 	"Michael Niedermayer",
 	"",
-	open,
+	vf_open,
 	&vf_opts
 };

libmpcodecs/vf_il.c

@@ -119,7 +119,7 @@ static void parse(FilterParam *fp, char* args){
 	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 @@ const vf_info_t vf_info_il = {
     "il",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_ilpack.c

@@ -404,7 +404,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt)
 	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 @@ const vf_info_t vf_info_ilpack = {
 	"ilpack",
 	"Richard Felker",
 	"",
-	open,
+	vf_open,
 	NULL
 };

libmpcodecs/vf_ivtc.c

@@ -522,7 +522,7 @@ static void uninit(struct vf_instance_s* vf)
 	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 @@ const vf_info_t vf_info_ivtc = {
     "ivtc",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };

libmpcodecs/vf_kerndeint.c

@@ -302,7 +302,7 @@ static int control(struct vf_instance_s* vf, int request, void* data){
 	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 @@ const vf_info_t vf_info_kerndeint = {
     "kerndeint",
     "Donald Graft",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_lavc.c

@@ -130,7 +130,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){
     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 @@ const vf_info_t vf_info_lavc = {
     "lavc",
     "A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_lavcdeint.c

@@ -161,7 +161,7 @@ query_format (struct vf_instance_s* vf, unsigned int fmt)
 
 
 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 @@ const vf_info_t vf_info_lavcdeint = {
     "Joe Rabinoff",
     "libavcodec's internal deinterlacer, in case you don't like "
       "the builtin ones (invoked with -pp or -npp)",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_mcdeint.c

@@ -306,7 +306,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){
     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 @@ const vf_info_t vf_info_mcdeint = {
     "mcdeint",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };

libmpcodecs/vf_mirror.c

@@ -113,7 +113,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double 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;
     return 1;
@@ -124,7 +124,7 @@ const vf_info_t vf_info_mirror = {
     "mirror",
     "Eyck",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_noformat.c

@@ -46,7 +46,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){
     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 @@ const vf_info_t vf_info_noformat = {
     "noformat",
     "Joey",
     "",
-    open,
+    vf_open,
     &vf_opts
 };
 

libmpcodecs/vf_noise.c

@@ -423,7 +423,7 @@ static unsigned int fmt_list[]={
     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 @@ const vf_info_t vf_info_noise = {
     "noise",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_ow.c

@@ -289,7 +289,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){
 }
 
 
-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 @@ const vf_info_t vf_info_ow = {
     "ow",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };

libmpcodecs/vf_palette.c

@@ -188,7 +188,7 @@ static void uninit(vf_instance_t *vf) {
   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 @@ const vf_info_t vf_info_palette = {
     "palette",
     "A'rpi & Alex",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_perspective.c

@@ -304,7 +304,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){
 	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 @@ const vf_info_t vf_info_perspective = {
     "perspective",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_phase.c

@@ -248,7 +248,7 @@ static void uninit(struct vf_instance_s* vf)
    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 @@ const vf_info_t vf_info_phase =
    "phase",
    "Ville Saari",
    "",
-   open,
+   vf_open,
    NULL
    };

libmpcodecs/vf_pp.c

@@ -169,7 +169,7 @@ static unsigned int fmt_list[]={
     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 @@ const vf_info_t vf_info_pp = {
     "pp",
     "A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_pp7.c

@@ -440,7 +440,7 @@ static int control(struct vf_instance_s* vf, int request, void* data){
     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 @@ const vf_info_t vf_info_pp7 = {
     "pp7",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };

libmpcodecs/vf_pullup.c

@@ -280,7 +280,7 @@ static void uninit(struct vf_instance_s* vf)
 	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 @@ const vf_info_t vf_info_pullup = {
     "pullup",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };

libmpcodecs/vf_qp.c

@@ -147,7 +147,7 @@ static void uninit(struct vf_instance_s* vf){
 }
 
 //===========================================================================//
-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 @@ const vf_info_t vf_info_qp = {
     "qp",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };

libmpcodecs/vf_rectangle.c

@@ -156,7 +156,7 @@ put_image(struct vf_instance_s* vf, mp_image_t* mpi, double pts){
 }
 
 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 @@ const vf_info_t vf_info_rectangle = {
     "rectangle",
     "Kim Minh Kaplan",
     "",
-    open,
+    vf_open,
     NULL
 };

libmpcodecs/vf_remove_logo.c

@@ -828,7 +828,7 @@ static int query_format(struct vf_instance_s * vf, unsigned int fmt)
  *
  * 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 @@ const vf_info_t vf_info_remove_logo = {
     "remove-logo",
     "Robert Edele",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_rgb2bgr.c

@@ -100,7 +100,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int outfmt){
     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 @@ const vf_info_t vf_info_rgb2bgr = {
     "rgb2bgr",
     "A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_rgbtest.c

@@ -140,7 +140,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int outfmt){
     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 @@ const vf_info_t vf_info_rgbtest = {
     "rgbtest",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_rotate.c

@@ -131,7 +131,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){
     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 @@ const vf_info_t vf_info_rotate = {
     "rotate",
     "A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_sab.c

@@ -272,7 +272,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){
 	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 @@ const vf_info_t vf_info_sab = {
     "sab",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_scale.c

@@ -563,7 +563,7 @@ static void uninit(struct vf_instance_s *vf){
     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 @@ const vf_info_t vf_info_scale = {
     "scale",
     "A'rpi",
     "",
-    open,
+    vf_open,
     &vf_opts
 };
 

libmpcodecs/vf_screenshot.c

@@ -282,8 +282,7 @@ static void uninit(vf_instance_t *vf)
     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 @@ const vf_info_t vf_info_screenshot = {
     "screenshot",
     "A'rpi, Jindrich Makovicka",
     "",
-    screenshot_open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_smartblur.c

@@ -216,7 +216,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){
 	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 @@ const vf_info_t vf_info_smartblur = {
     "smartblur",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_softpulldown.c

@@ -142,7 +142,7 @@ static void uninit(struct vf_instance_s* vf)
 	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 @@ const vf_info_t vf_info_softpulldown = {
     "softpulldown",
     "Tobias Diedrich <ranma+mplayer@tdiedrich.de>",
     "",
-    open,
+    vf_open,
     NULL
 };

libmpcodecs/vf_softskip.c

@@ -83,7 +83,7 @@ static void uninit(struct vf_instance_s* vf)
 	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 @@ const vf_info_t vf_info_softskip = {
     "softskip",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };

libmpcodecs/vf_spp.c

@@ -562,7 +562,7 @@ static int control(struct vf_instance_s* vf, int request, void* data){
     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 @@ const vf_info_t vf_info_spp = {
     "spp",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };

libmpcodecs/vf_swapuv.c

@@ -87,7 +87,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){
 	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 @@ const vf_info_t vf_info_swapuv = {
     "swapuv",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_telecine.c

@@ -131,7 +131,7 @@ static void uninit(struct vf_instance_s* vf)
 	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 @@ const vf_info_t vf_info_telecine = {
     "telecine",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };

libmpcodecs/vf_test.c

@@ -311,7 +311,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){
     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 @@ const vf_info_t vf_info_test = {
     "test",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_tfields.c

@@ -496,7 +496,7 @@ static void uninit(struct vf_instance_s* vf)
 	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 @@ const vf_info_t vf_info_tfields = {
     "tfields",
     "Rich Felker",
     "",
-    open,
+    vf_open,
     NULL
 };

libmpcodecs/vf_tile.c

@@ -231,7 +231,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt)
  * 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 @@ static int parse_int(char **s, int *rt, int def_val)
 }
 
 /* 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 @@ const vf_info_t vf_info_tile = {
     "tile",
     "Daniele Forghieri",
     "",
-    open,
+    vf_open,
     NULL
 };

libmpcodecs/vf_tinterlace.c

@@ -209,7 +209,7 @@ static void uninit(struct vf_instance_s* vf)
 	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 @@ const vf_info_t vf_info_tinterlace = {
 	"tinterlace",
 	"Michael Zucchi",
 	"",
-	open,
+	vf_open,
 	NULL
 };

libmpcodecs/vf_unsharp.c

@@ -270,7 +270,7 @@ static unsigned int fmt_list[] = {
     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 @@ const vf_info_t vf_info_unsharp = {
     "unsharp",
     "Remi Guyomarch",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_uspp.c

@@ -340,7 +340,7 @@ static int control(struct vf_instance_s* vf, int request, void* data){
     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 @@ const vf_info_t vf_info_uspp = {
     "uspp",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };

libmpcodecs/vf_vo.c

@@ -239,7 +239,7 @@ static void uninit(struct vf_instance_s* vf)
 }
 //===========================================================================//
 
-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 @@ const vf_info_t vf_info_vo = {
     "vo",
     "A'rpi",
     "for internal use",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_yadif.c

@@ -479,7 +479,7 @@ static int control(struct vf_instance_s* vf, int request, void* data){
     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 @@ const vf_info_t vf_info_yadif = {
     "yadif",
     "Michael Niedermayer",
     "",
-    open,
+    vf_open,
     NULL
 };

libmpcodecs/vf_yuvcsp.c

@@ -97,7 +97,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){
     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 @@ const vf_info_t vf_info_yuvcsp = {
     "yuvcsp",
     "Alex Beregszaszi",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_yuy2.c

@@ -81,7 +81,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){
     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 @@ const vf_info_t vf_info_yuy2 = {
     "yuy2",
     "A'rpi",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_yvu9.c

@@ -86,7 +86,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){
     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 @@ const vf_info_t vf_info_yvu9 = {
     "yvu9",
     "alex",
     "",
-    open,
+    vf_open,
     NULL
 };
 

libmpcodecs/vf_zrmjpeg.c

@@ -893,9 +893,9 @@ static void uninit(vf_instance_t *vf) {
  * 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 @@ const vf_info_t vf_info_zrmjpeg = {
     "zrmjpeg",
     "Rik Snel",
     "",
-    open,
+    vf_open,
     NULL
 };