summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-01-11 18:57:02 +0100
committerwm4 <wm4@nowhere>2014-01-11 18:58:07 +0100
commitad654f38036e53abbc902ffc5aae13fca61129e0 (patch)
tree333e7fbacfd21bd3a2b2d501da24b6a794d15fc2 /video
parent905029ec0c89b638792a429263bb6033eb074570 (diff)
downloadmpv-ad654f38036e53abbc902ffc5aae13fca61129e0.tar.bz2
mpv-ad654f38036e53abbc902ffc5aae13fca61129e0.tar.xz
options: remove --screenw and --screenh
Doesn't make any sense anymore. X11 (which was mentioned in the manpage) autodetects it, and everything else ignored the option values. Since for incomprehensible reasons the backends and vo.c still need to exchange information about the screensize using the option fields, they're not removed yet.
Diffstat (limited to 'video')
-rw-r--r--video/out/x11_common.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index 5fa0c54d23..4498dd34dd 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -524,13 +524,8 @@ int vo_x11_init(struct vo *vo)
init_atoms(vo->x11);
- x11->ws_width = opts->screenwidth;
- x11->ws_height = opts->screenheight;
-
- if (!x11->ws_width)
- x11->ws_width = DisplayWidth(x11->display, x11->screen);
- if (!x11->ws_height)
- x11->ws_height = DisplayHeight(x11->display, x11->screen);
+ x11->ws_width = DisplayWidth(x11->display, x11->screen);
+ x11->ws_height = DisplayHeight(x11->display, x11->screen);
opts->screenwidth = x11->ws_width;
opts->screenheight = x11->ws_height;