diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:52:17 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:52:17 +0200 |
commit | 5099b1458d6a5e57b4ebd7c6dfc07dbbd405a652 (patch) | |
tree | 705780fb6af4cdc0836a10a409fbd51495ec1142 /libmpcodecs/vf_tile.c | |
parent | 5eeba24ab73e4ae64d7212a9ceef3fb8801fe8a8 (diff) | |
parent | 160b880c4fd10cec41ba2c14c846d0a7e7f21048 (diff) | |
download | mpv-5099b1458d6a5e57b4ebd7c6dfc07dbbd405a652.tar.bz2 mpv-5099b1458d6a5e57b4ebd7c6dfc07dbbd405a652.tar.xz |
Merge svn changes up to r30683
Diffstat (limited to 'libmpcodecs/vf_tile.c')
-rw-r--r-- | libmpcodecs/vf_tile.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpcodecs/vf_tile.c b/libmpcodecs/vf_tile.c index 8e9cc7e650..dfad6a7098 100644 --- a/libmpcodecs/vf_tile.c +++ b/libmpcodecs/vf_tile.c @@ -231,7 +231,7 @@ static int query_format(struct vf_instance* vf, unsigned int fmt) * If the value is less then 0 def_val is used. * Return 0 for ok * - * Look below ( in open(...) ) for a use ... + * Look below ( in vf_open(...) ) for a use ... */ static int parse_int(char **s, int *rt, int def_val) { @@ -266,7 +266,7 @@ static int parse_int(char **s, int *rt, int def_val) } /* Main entry funct for the filter */ -static int open(vf_instance_t *vf, char* args) +static int vf_open(vf_instance_t *vf, char *args) { struct vf_priv_s *p; int er; @@ -323,6 +323,6 @@ const vf_info_t vf_info_tile = { "tile", "Daniele Forghieri", "", - open, + vf_open, NULL }; |