diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-04-14 00:33:12 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-04-14 00:33:12 +0100 |
| commit | 638fbcc93c675844c1c337518eb00db65d65d563 (patch) | |
| tree | 3c0169387b7ef62ac073ca09c7ff2caf34a5def1 | |
| parent | 7750ea523f4155e1f291479ce237ff968452abe4 (diff) | |
| download | xine-lib-638fbcc93c675844c1c337518eb00db65d65d563.tar.gz xine-lib-638fbcc93c675844c1c337518eb00db65d65d563.tar.bz2 | |
Remove #ifdef wrappers from the Xv & XcbXv plugins. Allows XcbXv to be built.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/video_out/video_out_xcbxv.c | 4 | ||||
| -rw-r--r-- | src/video_out/video_out_xv.c | 4 |
3 files changed, 2 insertions, 8 deletions
@@ -1,6 +1,8 @@ xine-lib (1.1.6) [UNRELEASED] * Split the DirectFB plugin into X11 and non-X versions. * Improve the Mac OS X video output plugin. Thanks to Matt Messier. + * Fixed the XcbXv plugin - an empty plugin would be built if "old" Xv + isn't detected. xine-lib (1.1.5) * Security fixes: diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c index db4be14fa..432d93416 100644 --- a/src/video_out/video_out_xcbxv.c +++ b/src/video_out/video_out_xcbxv.c @@ -37,8 +37,6 @@ #include "config.h" #endif -#ifdef HAVE_XV - #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -1618,5 +1616,3 @@ const plugin_info_t xine_plugin_info[] EXPORTED = { { PLUGIN_VIDEO_OUT, 21, "xv", XINE_VERSION_CODE, &vo_info_xv, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; - -#endif diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c index 55340a9e7..2cba3c2b6 100644 --- a/src/video_out/video_out_xv.c +++ b/src/video_out/video_out_xv.c @@ -36,8 +36,6 @@ #include "config.h" #endif -#ifdef HAVE_XV - #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -1676,5 +1674,3 @@ const plugin_info_t xine_plugin_info[] EXPORTED = { { PLUGIN_VIDEO_OUT, 21, "xv", XINE_VERSION_CODE, &vo_info_xv_2, init_class_2 }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; - -#endif |