[MPlayer-cvslog] r32111 - trunk/libvo/mga_template.c

[ramiro]

Author: ramiro
Date: Thu Sep  9 16:50:51 2010
New Revision: 32111

Log:
mga: disable g200 support

g200 should use the swscale interface to convert to nv12. If anyone still uses
such a card and is willing to test, just let me know.

Modified:
   trunk/libvo/mga_template.c

Modified: trunk/libvo/mga_template.c
==============================================================================
--- trunk/libvo/mga_template.c	Thu Sep  9 12:42:01 2010	(r32110)
+++ trunk/libvo/mga_template.c	Thu Sep  9 16:50:51 2010	(r32111)
@@ -19,7 +19,6 @@
 #include "fastmemcpy.h"
 #include "cpudetect.h"
 #include "libswscale/swscale.h"
-#include "libswscale/rgb2rgb.h"
 #include "libmpcodecs/vf_scale.h"
 #include "mp_msg.h"
 #include "help_mp.h"
@@ -67,7 +66,7 @@ static void draw_osd(void)
 }
 
 
-#ifdef CONFIG_LIBSWSCALE_A
+#if 0 // Should use libswscale's interface to NV12
 static void
 draw_slice_g200(uint8_t *image[], int stride[], int width,int height,int x,int y)
 {
@@ -128,7 +127,7 @@ draw_slice(uint8_t *src[], int stride[],
 	    w,h,x,y);
 #endif
 
-#ifdef CONFIG_LIBSWSCALE_A
+#if 0
 	if (mga_vid_config.card_type == MGA_G200)
             draw_slice_g200(src,stride,w,h,x,y);
 	else
@@ -433,12 +432,10 @@ static int mga_init(int width,int height
 			return -1;
 		}
 	}
-#ifndef CONFIG_LIBSWSCALE_A
 	if (mga_vid_config.card_type == MGA_G200) {
-		mp_msg(MSGT_VO, MSGL_FATAL, "G200 cards are only support with static libswscale\n");
+		mp_msg(MSGT_VO, MSGL_FATAL, "G200 cards support is currently broken. patches welcome.\n");
 		return -1;
 	}
-#endif
 
 	mp_msg(MSGT_VO,MSGL_V,"[MGA] Using %d buffers.\n",mga_vid_config.num_frames);
 
@@ -473,7 +470,6 @@ static int preinit(const char *vo_subdev
 {
 	uint32_t ver;
   const char *devname=vo_subdevice?vo_subdevice:"/dev/mga_vid";
-	sws_rgb2rgb_init(get_sws_cpuflags());
 
 	f = open(devname,O_RDWR);
 	if(f == -1)