diff options
| author | wm4 <wm4@nowhere> | 2015-09-30 22:52:22 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-09-30 22:52:22 +0200 |
| commit | ebb43f5176d52158dc6b115ce60305a2c8a63b76 (patch) | |
| tree | f1f547f4d9565b2c7857d56b996fe60a0cddaa04 /wscript_build.py | |
| parent | aff6e8e8da4aedda42bff9260ed46cf01985bdc0 (diff) | |
| download | mpv-ebb43f5176d52158dc6b115ce60305a2c8a63b76.tar.bz2 mpv-ebb43f5176d52158dc6b115ce60305a2c8a63b76.tar.xz | |
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.
Diffstat (limited to 'wscript_build.py')
| -rw-r--r-- | wscript_build.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/wscript_build.py b/wscript_build.py index 40e7623006..a9f9714c75 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -346,6 +346,7 @@ def build(ctx): ( "video/out/vo_vaapi.c", "vaapi-x11" ), ( "video/out/vo_vdpau.c", "vdpau" ), ( "video/out/vo_wayland.c", "wayland" ), + ( "video/out/vo_x11.c" , "x11" ), ( "video/out/vo_xv.c", "xv" ), ( "video/out/w32_common.c", "win32" ), ( "video/out/wayland_common.c", "wayland" ), |