summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-21 13:40:49 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-21 13:40:49 +0000
commit28cf6ea2be72588dba3b35db864bf63182d1b17f (patch)
tree17fa39add38a779d5d70e7593fc9b6a7f75a27fe /libmpcodecs
parent88f86bcc4d1863fdbbe0843229e1e97db61f0850 (diff)
downloadmpv-28cf6ea2be72588dba3b35db864bf63182d1b17f.tar.bz2
mpv-28cf6ea2be72588dba3b35db864bf63182d1b17f.tar.xz
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
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/vf.c2
-rw-r--r--libmpcodecs/vf.h2
-rw-r--r--libmpcodecs/vf_1bpp.c4
-rw-r--r--libmpcodecs/vf_2xsai.c4
-rw-r--r--libmpcodecs/vf_ass.c4
-rw-r--r--libmpcodecs/vf_blackframe.c4
-rw-r--r--libmpcodecs/vf_bmovl.c2
-rw-r--r--libmpcodecs/vf_boxblur.c4
-rw-r--r--libmpcodecs/vf_crop.c4
-rw-r--r--libmpcodecs/vf_cropdetect.c4
-rw-r--r--libmpcodecs/vf_decimate.c4
-rw-r--r--libmpcodecs/vf_delogo.c4
-rw-r--r--libmpcodecs/vf_denoise3d.c4
-rw-r--r--libmpcodecs/vf_detc.c4
-rw-r--r--libmpcodecs/vf_dint.c4
-rw-r--r--libmpcodecs/vf_divtc.c4
-rw-r--r--libmpcodecs/vf_down3dright.c4
-rw-r--r--libmpcodecs/vf_dsize.c4
-rw-r--r--libmpcodecs/vf_dvbscale.c4
-rw-r--r--libmpcodecs/vf_eq.c4
-rw-r--r--libmpcodecs/vf_eq2.c4
-rw-r--r--libmpcodecs/vf_expand.c4
-rw-r--r--libmpcodecs/vf_field.c4
-rw-r--r--libmpcodecs/vf_fil.c4
-rw-r--r--libmpcodecs/vf_filmdint.c4
-rw-r--r--libmpcodecs/vf_flip.c4
-rw-r--r--libmpcodecs/vf_format.c4
-rw-r--r--libmpcodecs/vf_framestep.c4
-rw-r--r--libmpcodecs/vf_fspp.c4
-rw-r--r--libmpcodecs/vf_geq.c4
-rw-r--r--libmpcodecs/vf_gradfun.c4
-rw-r--r--libmpcodecs/vf_halfpack.c4
-rw-r--r--libmpcodecs/vf_harddup.c4
-rw-r--r--libmpcodecs/vf_hqdn3d.c4
-rw-r--r--libmpcodecs/vf_hue.c4
-rw-r--r--libmpcodecs/vf_il.c4
-rw-r--r--libmpcodecs/vf_ilpack.c4
-rw-r--r--libmpcodecs/vf_ivtc.c4
-rw-r--r--libmpcodecs/vf_kerndeint.c4
-rw-r--r--libmpcodecs/vf_lavc.c4
-rw-r--r--libmpcodecs/vf_lavcdeint.c4
-rw-r--r--libmpcodecs/vf_mcdeint.c4
-rw-r--r--libmpcodecs/vf_mirror.c4
-rw-r--r--libmpcodecs/vf_noformat.c4
-rw-r--r--libmpcodecs/vf_noise.c4
-rw-r--r--libmpcodecs/vf_ow.c4
-rw-r--r--libmpcodecs/vf_palette.c4
-rw-r--r--libmpcodecs/vf_perspective.c4
-rw-r--r--libmpcodecs/vf_phase.c4
-rw-r--r--libmpcodecs/vf_pp.c4
-rw-r--r--libmpcodecs/vf_pp7.c4
-rw-r--r--libmpcodecs/vf_pullup.c4
-rw-r--r--libmpcodecs/vf_qp.c4
-rw-r--r--libmpcodecs/vf_rectangle.c4
-rw-r--r--libmpcodecs/vf_remove_logo.c4
-rw-r--r--libmpcodecs/vf_rgb2bgr.c4
-rw-r--r--libmpcodecs/vf_rgbtest.c4
-rw-r--r--libmpcodecs/vf_rotate.c4
-rw-r--r--libmpcodecs/vf_sab.c4
-rw-r--r--libmpcodecs/vf_scale.c4
-rw-r--r--libmpcodecs/vf_screenshot.c5
-rw-r--r--libmpcodecs/vf_smartblur.c4
-rw-r--r--libmpcodecs/vf_softpulldown.c4
-rw-r--r--libmpcodecs/vf_softskip.c4
-rw-r--r--libmpcodecs/vf_spp.c4
-rw-r--r--libmpcodecs/vf_swapuv.c4
-rw-r--r--libmpcodecs/vf_telecine.c4
-rw-r--r--libmpcodecs/vf_test.c4
-rw-r--r--libmpcodecs/vf_tfields.c4
-rw-r--r--libmpcodecs/vf_tile.c6
-rw-r--r--libmpcodecs/vf_tinterlace.c4
-rw-r--r--libmpcodecs/vf_unsharp.c4
-rw-r--r--libmpcodecs/vf_uspp.c4
-rw-r--r--libmpcodecs/vf_vo.c4
-rw-r--r--libmpcodecs/vf_yadif.c4
-rw-r--r--libmpcodecs/vf_yuvcsp.c4
-rw-r--r--libmpcodecs/vf_yuy2.c4
-rw-r--r--libmpcodecs/vf_yvu9.c4
-rw-r--r--libmpcodecs/vf_zrmjpeg.c6
79 files changed, 157 insertions, 158 deletions
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c
index e6611efeb8..44c5312a34 100644
--- a/libmpcodecs/vf.c
+++ b/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;
diff --git a/libmpcodecs/vf.h b/libmpcodecs/vf.h
index 91a57f2f9d..f260c13328 100644
--- a/libmpcodecs/vf.h
+++ b/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;
diff --git a/libmpcodecs/vf_1bpp.c b/libmpcodecs/vf_1bpp.c
index 43c5677202..9c27d15f58 100644
--- a/libmpcodecs/vf_1bpp.c
+++ b/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
};
diff --git a/libmpcodecs/vf_2xsai.c b/libmpcodecs/vf_2xsai.c
index 83805b8794..c5889c2891 100644
--- a/libmpcodecs/vf_2xsai.c
+++ b/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
};
diff --git a/libmpcodecs/vf_ass.c b/libmpcodecs/vf_ass.c
index 5a96c13203..9e1f131cef 100644
--- a/libmpcodecs/vf_ass.c
+++ b/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
};
diff --git a/libmpcodecs/vf_blackframe.c b/libmpcodecs/vf_blackframe.c
index dce13ea927..9ecd55c795 100644
--- a/libmpcodecs/vf_blackframe.c
+++ b/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
};
diff --git a/libmpcodecs/vf_bmovl.c b/libmpcodecs/vf_bmovl.c
index ee4eb9a942..56f2a5eb87 100644
--- a/libmpcodecs/vf_bmovl.c
+++ b/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];
diff --git a/libmpcodecs/vf_boxblur.c b/libmpcodecs/vf_boxblur.c
index f8f2026566..b9d0cc7fe9 100644
--- a/libmpcodecs/vf_boxblur.c
+++ b/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
};
diff --git a/libmpcodecs/vf_crop.c b/libmpcodecs/vf_crop.c
index 58683e01b1..9219a87a19 100644
--- a/libmpcodecs/vf_crop.c
+++ b/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
};
diff --git a/libmpcodecs/vf_cropdetect.c b/libmpcodecs/vf_cropdetect.c
index 5aee04ada9..9e230783bf 100644
--- a/libmpcodecs/vf_cropdetect.c
+++ b/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
};
diff --git a/libmpcodecs/vf_decimate.c b/libmpcodecs/vf_decimate.c
index 2930fb8b52..dd7bd29015 100644
--- a/libmpcodecs/vf_decimate.c
+++ b/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
};
diff --git a/libmpcodecs/vf_delogo.c b/libmpcodecs/vf_delogo.c
index b07fd4017e..9152c4fa6b 100644
--- a/libmpcodecs/vf_delogo.c
+++ b/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
};
diff --git a/libmpcodecs/vf_denoise3d.c b/libmpcodecs/vf_denoise3d.c
index 0958305936..4b71dbe422 100644
--- a/libmpcodecs/vf_denoise3d.c
+++ b/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
};
diff --git a/libmpcodecs/vf_detc.c b/libmpcodecs/vf_detc.c
index 66c04326a2..6b1bac9ad5 100644
--- a/libmpcodecs/vf_detc.c
+++ b/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
};
diff --git a/libmpcodecs/vf_dint.c b/libmpcodecs/vf_dint.c
index 1d10f773d6..9a65f52ca6 100644
--- a/libmpcodecs/vf_dint.c
+++ b/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
};
diff --git a/libmpcodecs/vf_divtc.c b/libmpcodecs/vf_divtc.c
index 7dbce06363..13e4fd1580 100644
--- a/libmpcodecs/vf_divtc.c
+++ b/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
};
diff --git a/libmpcodecs/vf_down3dright.c b/libmpcodecs/vf_down3dright.c
index c78420836f..eba3e4ed63 100644
--- a/libmpcodecs/vf_down3dright.c
+++ b/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
};
diff --git a/libmpcodecs/vf_dsize.c b/libmpcodecs/vf_dsize.c
index 4e530a2f76..fae2db19f3 100644
--- a/libmpcodecs/vf_dsize.c
+++ b/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
};
diff --git a/libmpcodecs/vf_dvbscale.c b/libmpcodecs/vf_dvbscale.c
index d084ff61f5..80940a0e1f 100644
--- a/libmpcodecs/vf_dvbscale.c
+++ b/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
};
diff --git a/libmpcodecs/vf_eq.c b/libmpcodecs/vf_eq.c
index 241fb36b74..26cfc878df 100644
--- a/libmpcodecs/vf_eq.c
+++ b/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
};
diff --git a/libmpcodecs/vf_eq2.c b/libmpcodecs/vf_eq2.c
index 45d3f61b0b..099acc85a0 100644
--- a/libmpcodecs/vf_eq2.c
+++ b/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;