From ebb43f5176d52158dc6b115ce60305a2c8a63b76 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 30 Sep 2015 22:52:22 +0200 Subject: Revert "vo_x11: remove this video output" This reverts commit d11184a256ed709a03fa94a4e3940eed1b76d76f. Unfortunately, there was a lot of unexpected resistance. Do note that this is still extremely slow, crappy, etc. Note that vo_x11.c was further edited. Compared to the removed vo_x11.c, an additional ~200 lines of code was removed in order to simplify it. I tried to strip it down as much as possible. In particular, support for odd non-32 bit formats (24, 16, 15, 8 bit) is dropped. Closes #2300. --- video/out/vo.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'video/out/vo.c') diff --git a/video/out/vo.c b/video/out/vo.c index 880a2e56a4..71252e2883 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -47,6 +47,7 @@ #include "osdep/io.h" #include "osdep/threads.h" +extern const struct vo_driver video_out_x11; extern const struct vo_driver video_out_vdpau; extern const struct vo_driver video_out_xv; extern const struct vo_driver video_out_opengl; @@ -90,6 +91,9 @@ const struct vo_driver *const video_out_drivers[] = #endif #if HAVE_VAAPI &video_out_vaapi, +#endif +#if HAVE_X11 + &video_out_x11, #endif &video_out_null, // should not be auto-selected -- cgit v1.2.3