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_zr2.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_zr2.c')
| -rw-r--r-- | libvo/vo_zr2.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libvo/vo_zr2.c b/libvo/vo_zr2.c index 2bad93a731..57addb03f1 100644 --- a/libvo/vo_zr2.c +++ b/libvo/vo_zr2.c @@ -192,14 +192,16 @@ static int get_norm(const char *n) { return -1; /* invalid */ } -static int nc(const char **norm) { +static int nc(void *normp) { + const char **norm = normp; if (get_norm(*norm) == -1) { ERROR("norm \"%s\" is not supported, choose from PAL, NTSC, SECAM and auto\n", *norm); return 0; } else return 1; } -static int pbc(int *prebuf) { +static int pbc(void *prebufp) { + int *prebuf = prebufp; if (*prebuf) WARNING("prebuffering is not yet supported\n"); return 1; } @@ -211,8 +213,8 @@ static int preinit(const char *arg) { int norm = VIDEO_MODE_AUTO, prebuf = 0; const opt_t subopts[] = { /* don't want warnings with -Wall... */ { "dev", OPT_ARG_MSTRZ, &dev_arg, NULL }, - { "prebuf", OPT_ARG_BOOL, &prebuf, (opt_test_f)pbc }, - { "norm", OPT_ARG_MSTRZ, &norm_arg, (opt_test_f)nc }, + { "prebuf", OPT_ARG_BOOL, &prebuf, pbc }, + { "norm", OPT_ARG_MSTRZ, &norm_arg, nc }, { NULL, 0, NULL, NULL } }; |