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 /TOOLS | |
| parent | aff6e8e8da4aedda42bff9260ed46cf01985bdc0 (diff) | |
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 'TOOLS')
| -rw-r--r-- | TOOLS/old-makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/TOOLS/old-makefile b/TOOLS/old-makefile index bb15f96630..3c90a4060d 100644 --- a/TOOLS/old-makefile +++ b/TOOLS/old-makefile @@ -93,7 +93,8 @@ SOURCES-$(VAAPI_VPP) += video/filter/vf_vavpp.c SOURCES-$(VAAPI_GLX) += video/out/opengl/hwdec_vaglx.c SOURCES-$(VAAPI_X_EGL) += video/out/opengl/hwdec_vaegl.c -SOURCES-$(XV) += video/out/x11_common.c video/out/vo_xv.c +SOURCES-$(X11) += video/out/vo_x11.c video/out/x11_common.c +SOURCES-$(XV) += video/out/vo_xv.c SOURCES-$(WAYLAND) += video/out/vo_wayland.c \ video/out/wayland_common.c \ video/out/wayland/buffer.c \ |