Mercurial > mplayer.hg

diff libmpcodecs/vf_remove_logo.c @ 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 969a093964a9
children a972c1a4a012
line wrap: on
line diff
--- 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
 };