aboutsummaryrefslogtreecommitdiffhomepage
path: root/libmpcodecs/vf_zrmjpeg.c
diff options
context:
space:
mode:
authorGravatar diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-21 13:40:49 +0000
committerGravatar diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-21 13:40:49 +0000
commit28cf6ea2be72588dba3b35db864bf63182d1b17f (patch)
tree17fa39add38a779d5d70e7593fc9b6a7f75a27fe /libmpcodecs/vf_zrmjpeg.c
parent88f86bcc4d1863fdbbe0843229e1e97db61f0850 (diff)
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/vf_zrmjpeg.c')
-rw-r--r--libmpcodecs/vf_zrmjpeg.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpcodecs/vf_zrmjpeg.c b/libmpcodecs/vf_zrmjpeg.c
index 8747778b7f..c9bcfd0343 100644
--- a/libmpcodecs/vf_zrmjpeg.c
+++ b/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
};