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_zrmjpeg.c | |
| parent | 5eeba24ab73e4ae64d7212a9ceef3fb8801fe8a8 (diff) | |
| parent | 160b880c4fd10cec41ba2c14c846d0a7e7f21048 (diff) | |
Merge svn changes up to r30683
Diffstat (limited to 'libmpcodecs/vf_zrmjpeg.c')
| -rw-r--r-- | libmpcodecs/vf_zrmjpeg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpcodecs/vf_zrmjpeg.c b/libmpcodecs/vf_zrmjpeg.c index 31f51e7765..3d90052b5e 100644 --- a/libmpcodecs/vf_zrmjpeg.c +++ b/libmpcodecs/vf_zrmjpeg.c @@ -893,9 +893,9 @@ static void uninit(vf_instance_t *vf) { * This routine will do some basic initialization of local structures etc., * and then parse the command line arguments specific for the ZRMJPEG filter. */ -static int open(vf_instance_t *vf, char* args){ +static int vf_open(vf_instance_t *vf, char *args){ struct vf_priv_s *priv; - VERBOSE("open() called: args=\"%s\"\n", args); + VERBOSE("vf_open() called: args=\"%s\"\n", args); vf->config = config; vf->put_image = put_image; @@ -1062,6 +1062,6 @@ const vf_info_t vf_info_zrmjpeg = { "zrmjpeg", "Rik Snel", "", - open, + vf_open, NULL }; |