summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vf_blackframe.c
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/vf_blackframe.c
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/vf_blackframe.c')
-rw-r--r--libmpcodecs/vf_blackframe.c4
1 files changed, 2 insertions, 2 deletions
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
};