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_pp7.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_pp7.c')
-rw-r--r-- | libmpcodecs/vf_pp7.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpcodecs/vf_pp7.c b/libmpcodecs/vf_pp7.c index 56b196a3a3..da26bf0fb7 100644 --- a/libmpcodecs/vf_pp7.c +++ b/libmpcodecs/vf_pp7.c @@ -440,7 +440,7 @@ static int control(struct vf_instance* vf, int request, void* data){ return vf_next_control(vf,request,data); } -static int open(vf_instance_t *vf, char* args){ +static int vf_open(vf_instance_t *vf, char *args){ vf->config=config; vf->put_image=put_image; vf->get_image=get_image; @@ -486,6 +486,6 @@ const vf_info_t vf_info_pp7 = { "pp7", "Michael Niedermayer", "", - open, + vf_open, NULL }; |