summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vf_remove_logo.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 00:52:17 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 00:52:17 +0200
commit5099b1458d6a5e57b4ebd7c6dfc07dbbd405a652 (patch)
tree705780fb6af4cdc0836a10a409fbd51495ec1142 /libmpcodecs/vf_remove_logo.c
parent5eeba24ab73e4ae64d7212a9ceef3fb8801fe8a8 (diff)
parent160b880c4fd10cec41ba2c14c846d0a7e7f21048 (diff)
downloadmpv-5099b1458d6a5e57b4ebd7c6dfc07dbbd405a652.tar.bz2
mpv-5099b1458d6a5e57b4ebd7c6dfc07dbbd405a652.tar.xz
Merge svn changes up to r30683
Diffstat (limited to 'libmpcodecs/vf_remove_logo.c')
-rw-r--r--libmpcodecs/vf_remove_logo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpcodecs/vf_remove_logo.c b/libmpcodecs/vf_remove_logo.c
index 8397ae53cf..711606f922 100644
--- a/libmpcodecs/vf_remove_logo.c
+++ b/libmpcodecs/vf_remove_logo.c
@@ -828,7 +828,7 @@ static int query_format(struct vf_instance * 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
};