[MPlayer-cvslog] r31314 - trunk/libvo/vo_yuv4mpeg.c

[siretart]

Author: siretart
Date: Thu Jun  3 23:50:08 2010
New Revision: 31314

Log:
apply missing bits from http://repo.or.cz/w/mplayer.git/commitdiff/cd4e8dc1fa2863dcce62a44dd9ea105f9f9288f4

Modified:
   trunk/libvo/vo_yuv4mpeg.c

Modified: trunk/libvo/vo_yuv4mpeg.c
==============================================================================
--- trunk/libvo/vo_yuv4mpeg.c	Thu Jun  3 23:01:37 2010	(r31313)
+++ trunk/libvo/vo_yuv4mpeg.c	Thu Jun  3 23:50:08 2010	(r31314)
@@ -149,6 +149,7 @@ static int config(uint32_t width, uint32
 		return -1;
 	}
 
+#ifdef CONFIG_LIBSWSCALE_A
 	if(using_format != IMGFMT_YV12)
 	{
 		sws_rgb2rgb_init(get_sws_cpuflags());
@@ -160,6 +161,7 @@ static int config(uint32_t width, uint32
 			return -1;
 		}
 	}
+#endif
 
 	write_bytes = image_width * image_height * 3 / 2;
 	image = malloc(write_bytes);
@@ -464,9 +466,11 @@ static int query_format(uint32_t format)
 		{
 			case IMGFMT_YV12:
 				return VFCAP_CSP_SUPPORTED|VFCAP_OSD|VFCAP_ACCEPT_STRIDE;
+#ifdef CONFIG_LIBSWSCALE_A
 			case IMGFMT_BGR|24:
 			case IMGFMT_RGB|24:
 				return VFCAP_CSP_SUPPORTED|VFCAP_CSP_SUPPORTED_BY_HW|VFCAP_OSD|VFCAP_ACCEPT_STRIDE;
+#endif
 		}
 	}
 	else
@@ -476,9 +480,11 @@ static int query_format(uint32_t format)
 		{
 			case IMGFMT_YV12:
 				return VFCAP_CSP_SUPPORTED|VFCAP_CSP_SUPPORTED_BY_HW|VFCAP_OSD|VFCAP_ACCEPT_STRIDE;
+#ifdef CONFIG_LIBSWSCALE_A
     		case IMGFMT_BGR|24:
     		case IMGFMT_RGB|24:
         		return VFCAP_CSP_SUPPORTED|VFCAP_OSD|VFCAP_ACCEPT_STRIDE;
+#endif
     	}
 	}
 	return 0;