diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-03-14 23:52:45 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-03-14 23:52:45 +0200 |
| commit | ae2faad6669c313b7a5dd318baeee0bffdd47031 (patch) | |
| tree | 0b383b5dde56d54be4b144e7e23e96bd8bdd43cf /libvo/vo_xv.c | |
| parent | b93f4b7bba0e31d157b74685d3166f74a6c244d7 (diff) | |
| parent | 642162c07460e439d1d81cda4643dc028ed238e0 (diff) | |
| download | mpv-ae2faad6669c313b7a5dd318baeee0bffdd47031.tar.bz2 mpv-ae2faad6669c313b7a5dd318baeee0bffdd47031.tar.xz | |
Merge svn changes up to r28951
Diffstat (limited to 'libvo/vo_xv.c')
| -rw-r--r-- | libvo/vo_xv.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index fc6f0b99d9..178c9c4ca9 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -317,8 +317,6 @@ static int config(struct vo *vo, uint32_t width, uint32_t height, ctx->current_buf = 0; ctx->current_ip_buf = 0; - if ((flags & VOFLAG_FULLSCREEN) && WinID <= 0) - vo_fs = 1; resize(vo); @@ -682,7 +680,7 @@ static int preinit(struct vo *vo, const char *arg) struct vo_x11_state *x11 = vo->x11; int xv_adaptor = -1; - opt_t subopts[] = { + 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}, |