diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 01:05:30 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 01:05:30 +0200 |
| commit | 231b33a02fae95b260120349040106bfa34a3750 (patch) | |
| tree | 23c4de0e6263b2d99966348d7003177b3b3e3740 /libvo/vo_jpeg.c | |
| parent | 52126e574c7872ca95e7974cfe5445421b74f24c (diff) | |
| parent | 92cd6dc3e916ae4275ff05d2b238fc778cfbfc6b (diff) | |
| download | mpv-231b33a02fae95b260120349040106bfa34a3750.tar.bz2 mpv-231b33a02fae95b260120349040106bfa34a3750.tar.xz | |
Merge svn changes up to r30165
Diffstat (limited to 'libvo/vo_jpeg.c')
| -rw-r--r-- | libvo/vo_jpeg.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libvo/vo_jpeg.c b/libvo/vo_jpeg.c index b6a5a8c352..112ec0c2ef 100644 --- a/libvo/vo_jpeg.c +++ b/libvo/vo_jpeg.c @@ -330,11 +330,10 @@ static void check_events(void) /** \brief Validation function for values [0-100] */ -static int int_zero_hundred(int *val) +static int int_zero_hundred(void *valp) { - if ( (*val >=0) && (*val<=100) ) - return 1; - return 0; + int *val = valp; + return *val >= 0 && *val <= 100; } static int preinit(const char *arg) @@ -343,15 +342,15 @@ static int preinit(const char *arg) {"progressive", OPT_ARG_BOOL, &jpeg_progressive_mode, NULL}, {"baseline", OPT_ARG_BOOL, &jpeg_baseline, NULL}, {"optimize", OPT_ARG_INT, &jpeg_optimize, - (opt_test_f)int_zero_hundred}, + int_zero_hundred}, {"smooth", OPT_ARG_INT, &jpeg_smooth, - (opt_test_f)int_zero_hundred}, + int_zero_hundred}, {"quality", OPT_ARG_INT, &jpeg_quality, - (opt_test_f)int_zero_hundred}, + int_zero_hundred}, {"dpi", OPT_ARG_INT, &jpeg_dpi, NULL}, {"outdir", OPT_ARG_MSTRZ, &jpeg_outdir, NULL}, {"subdirs", OPT_ARG_MSTRZ, &jpeg_subdirs, NULL}, - {"maxfiles", OPT_ARG_INT, &jpeg_maxfiles, (opt_test_f)int_pos}, + {"maxfiles", OPT_ARG_INT, &jpeg_maxfiles, int_pos}, {NULL, 0, NULL, NULL} }; const char *info_message = NULL; |