[MPlayer-cvslog] r31437 - in trunk: configure libvo/mga_template.c

[reimar]

Author: reimar
Date: Wed Jun 16 21:40:26 2010
New Revision: 31437

Log:
Disable only G200 support when compiling against dynamic libswscale instead
of disabling mga support completely.

Modified:
   trunk/configure
   trunk/libvo/mga_template.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	Wed Jun 16 21:09:06 2010	(r31436)
+++ trunk/configure	Wed Jun 16 21:40:26 2010	(r31437)
@@ -7431,8 +7431,6 @@ echocheck "/dev/mga_vid"
 if test "$_mga" = auto ; then
   _mga=no
   test -c /dev/mga_vid && _mga=yes
-  test "$_libswscale_a" = no && _mga=no &&
-    res_comment="mga requires libswscale.a"
 fi
 if test "$_mga" = yes ; then
   def_mga='#define CONFIG_MGA 1'

Modified: trunk/libvo/mga_template.c
==============================================================================
--- trunk/libvo/mga_template.c	Wed Jun 16 21:09:06 2010	(r31436)
+++ trunk/libvo/mga_template.c	Wed Jun 16 21:40:26 2010	(r31437)
@@ -67,6 +67,7 @@ static void draw_osd(void)
 }
 
 
+#ifdef CONFIG_LIBSWSCALE_A
 static void
 draw_slice_g200(uint8_t *image[], int stride[], int width,int height,int x,int y)
 {
@@ -84,6 +85,7 @@ draw_slice_g200(uint8_t *image[], int st
 		width, height,
 		stride[1], stride[2], bespitch);
 }
+#endif
 
 static void
 draw_slice_g400(uint8_t *image[], int stride[], int w,int h,int x,int y)
@@ -126,9 +128,11 @@ draw_slice(uint8_t *src[], int stride[],
 	    w,h,x,y);
 #endif
 
+#ifdef CONFIG_LIBSWSCALE_A
 	if (mga_vid_config.card_type == MGA_G200)
             draw_slice_g200(src,stride,w,h,x,y);
 	else
+#endif
             draw_slice_g400(src,stride,w,h,x,y);
 	return 0;
 }
@@ -429,6 +433,12 @@ 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");
+		return -1;
+	}
+#endif
 
 	mp_msg(MSGT_VO,MSGL_V,"[MGA] Using %d buffers.\n",mga_vid_config.num_frames);