summaryrefslogtreecommitdiffstats
path: root/libvo/vo_jpeg.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-04-01 02:26:34 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-04-01 02:43:47 +0300
commitcf9edda1d370d39bc8a3d020a9c2bc4090d2457e (patch)
tree1d1bbc529a4e8109fb6aa5cadf0dbbb7bd61013a /libvo/vo_jpeg.c
parent7af8417ae7beb409f54849956a7037bc66c4c334 (diff)
parent1c37a6427abef0827c608d328d37ca1b1a0a022d (diff)
downloadmpv-cf9edda1d370d39bc8a3d020a9c2bc4090d2457e.tar.bz2
mpv-cf9edda1d370d39bc8a3d020a9c2bc4090d2457e.tar.xz
Merge svn changes up to r29117
Diffstat (limited to 'libvo/vo_jpeg.c')
-rw-r--r--libvo/vo_jpeg.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/libvo/vo_jpeg.c b/libvo/vo_jpeg.c
index cd6a83a938..d29d7b0cd5 100644
--- a/libvo/vo_jpeg.c
+++ b/libvo/vo_jpeg.c
@@ -340,19 +340,19 @@ static int int_zero_hundred(int *val)
static int preinit(const char *arg)
{
const opt_t subopts[] = {
- {"progressive", OPT_ARG_BOOL, &jpeg_progressive_mode, NULL, 0},
- {"baseline", OPT_ARG_BOOL, &jpeg_baseline, NULL, 0},
+ {"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, 0},
+ (opt_test_f)int_zero_hundred},
{"smooth", OPT_ARG_INT, &jpeg_smooth,
- (opt_test_f)int_zero_hundred, 0},
+ (opt_test_f)int_zero_hundred},
{"quality", OPT_ARG_INT, &jpeg_quality,
- (opt_test_f)int_zero_hundred, 0},
- {"dpi", OPT_ARG_INT, &jpeg_dpi, NULL, 0},
- {"outdir", OPT_ARG_MSTRZ, &jpeg_outdir, NULL, 0},
- {"subdirs", OPT_ARG_MSTRZ, &jpeg_subdirs, NULL, 0},
- {"maxfiles", OPT_ARG_INT, &jpeg_maxfiles, (opt_test_f)int_pos, 0},
- {NULL, 0, NULL, NULL, 0}
+ (opt_test_f)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},
+ {NULL, 0, NULL, NULL}
};
const char *info_message = NULL;