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_xv.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_xv.c')
| -rw-r--r-- | libvo/vo_xv.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 7ab087c039..26e03a8941 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -663,13 +663,14 @@ static int preinit(struct vo *vo, const char *arg) struct vo_x11_state *x11 = vo->x11; int xv_adaptor = -1; - const opt_t subopts[] = { - /* name arg type arg var test */ - {"port", OPT_ARG_INT, &x11->xv_port, (opt_test_f) int_pos}, - {"adaptor", OPT_ARG_INT, &xv_adaptor, (opt_test_f) int_non_neg}, - {"ck", OPT_ARG_STR, &ck_src_arg, xv_test_ck}, - {"ck-method", OPT_ARG_STR, &ck_method_arg, xv_test_ckm}, - {NULL} + const opt_t subopts[] = + { + /* name arg type arg var test */ + { "port", OPT_ARG_INT, &x11->xv_port, int_pos }, + { "adaptor", OPT_ARG_INT, &xv_adaptor, int_non_neg }, + { "ck", OPT_ARG_STR, &ck_src_arg, xv_test_ck }, + { "ck-method", OPT_ARG_STR, &ck_method_arg, xv_test_ckm }, + { NULL } }; x11->xv_port = 0; |