.SDL:

	.removed the YUV thing from the SDL
	.cleaned up the makefile to remove it
	.UNTESTED (seems to compile).

diff --git a/Makefile.in b/Makefile.in
index 0a5047514035189f16d79ee98f93f3597d100cde..1e4002acf84919610072954cf9d64e1fff54d0e9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -293,9 +293,9 @@ PLUGIN_GGI    = plugins/ggi/ggi.o \
 
 PLUGIN_SDL    = plugins/sdl/sdl.o \
                plugins/sdl/intf_sdl.o \
-               plugins/sdl/vout_sdl.o \
-               plugins/sdl/video_yuv.o \
-               plugins/sdl/video_yuvall.o
+               plugins/sdl/vout_sdl.o 
+#              plugins/sdl/video_yuv.o \
+#              plugins/sdl/video_yuvall.o
 
 
 PLUGIN_GLIDE  = plugins/glide/glide.o \

diff --git a/plugins/sdl/sdl.c b/plugins/sdl/sdl.c
index 2e40b9a6c2ee1702b65a2efcc3f75a155dd7289c..85963feb207a334ce042aca48e114b90e3787edd 100644 (file)
--- a/plugins/sdl/sdl.c
+++ b/plugins/sdl/sdl.c
@@ -46,7 +46,10 @@
  *****************************************************************************/
 static void vout_GetPlugin( p_vout_thread_t p_vout );
 static void intf_GetPlugin( p_intf_thread_t p_intf );
+
+#if 0
 static void yuv_GetPlugin( p_vout_thread_t p_vout );
+#endif
 
 /* Video output */
 int     vout_SDLCreate       ( vout_thread_t *p_vout, char *psz_display,
@@ -59,12 +62,12 @@ void    vout_SDLDisplay      ( p_vout_thread_t p_vout );
 void    vout_SDLSetPalette   ( p_vout_thread_t p_vout,
                                u16 *red, u16 *green, u16 *blue, u16 *transp );
 
-
+#if 0
 /* YUV transformations */
 int     yuv_CInit          ( p_vout_thread_t p_vout );
 int     yuv_CReset         ( p_vout_thread_t p_vout );
 void    yuv_CEnd           ( p_vout_thread_t p_vout );
-
+#endif
 
 /* Interface */
 int     intf_SDLCreate       ( p_intf_thread_t p_intf );
@@ -78,7 +81,7 @@ plugin_info_t * GetConfig( void )
 {
     plugin_info_t * p_info = (plugin_info_t *) malloc( sizeof(plugin_info_t) );
 
-    p_info->psz_name    = "SDL (video yuv conversion?, audio?)";
+    p_info->psz_name    = "SDL (video)";
     p_info->psz_version = VERSION;
     p_info->psz_author  = "the VideoLAN team <vlc@videolan.org>";
 
@@ -91,13 +94,17 @@ plugin_info_t * GetConfig( void )
      * hardware YUV -> display acceleration....
      */
 
-    
+#if 0
     p_info->yuv_GetPlugin  = (void *) yuv_GetPlugin;
+#else
+    p_info->yuv_GetPlugin = NULL;
+#endif
+           
     
     /* if the SDL libraries are there, assume we can enter the
      * initialization part at least, even if we fail afterwards */
     
-    p_info->i_score = 0x50;
+    p_info->i_score = 0x100;
     
     
     
@@ -131,11 +138,12 @@ static void intf_GetPlugin( p_intf_thread_t p_intf )
     p_intf->p_sys_manage  = intf_SDLManage;
 }
 
+#if 0
 static void yuv_GetPlugin( p_vout_thread_t p_vout )
 {
     p_vout->p_yuv_init   = yuv_CInit;
     p_vout->p_yuv_reset  = yuv_CReset;
     p_vout->p_yuv_end    = yuv_CEnd;
 }
-
+#endif