diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-04-14 16:01:36 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-04-14 16:01:36 +0100 |
| commit | 8b6e5d37f4ca7bc816a6bc1002364cb71981047b (patch) | |
| tree | 829cebc1f8480058378658209ed7cf8474f3c6df /src/video_out | |
| parent | 50775180cf63cc4bf9f83fedf3808c9480a3c1f4 (diff) | |
| parent | 9c8e4a2b16306a24d37053d7dc12c6de98afd74b (diff) | |
| download | xine-lib-8b6e5d37f4ca7bc816a6bc1002364cb71981047b.tar.gz xine-lib-8b6e5d37f4ca7bc816a6bc1002364cb71981047b.tar.bz2 | |
Merge changes from 1.1.
Diffstat (limited to 'src/video_out')
| -rw-r--r-- | src/video_out/video_out_xcbxv.c | 4 | ||||
| -rw-r--r-- | src/video_out/video_out_xv.c | 4 |
2 files changed, 0 insertions, 8 deletions
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 |