[Mplayer-cvslog] CVS: main/libvo vo_vesa.c,1.23,1.24 vo_x11.c,1.36,1.37

[Michael Niedermayer]

Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv31379/libvo

Modified Files:
	vo_vesa.c vo_x11.c 
Log Message:
yv12 to yv12 scaler
someone who knows a bit about vo_odivx could add support for it ...


Index: vo_vesa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_vesa.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- vo_vesa.c	28 Oct 2001 10:45:41 -0000	1.23
+++ vo_vesa.c	28 Oct 2001 18:30:59 -0000	1.24
@@ -1,4 +1,4 @@
-/* 
+/*
  *  video_out_vesa.c
  *
  *	Copyright (C) Nick Kurshev <nickols_k at mail.ru> - Oct 2001
@@ -246,8 +246,9 @@
 	printf("vo_vesa: draw_slice was called: w=%u h=%u x=%u y=%u\n",w,h,x,y);
     if(vesa_zoom)
     {
-	 SwScale_YV12slice_brg24(image,stride,y,h,
-	                     yuv_buffer,
+	 uint8_t *dst[3]= {yuv_buffer, NULL, NULL};
+	 SwScale_YV12slice(image,stride,y,h,
+	                     dst,
 			     image_width*((video_mode_info.BitsPerPixel+7)/8),
 			     image_width, video_mode_info.BitsPerPixel,
 	    		     scale_xinc, scale_yinc);

Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- vo_x11.c	20 Oct 2001 23:58:23 -0000	1.36
+++ vo_x11.c	28 Oct 2001 18:30:59 -0000	1.37
@@ -484,8 +484,9 @@
 {
 
 if(scale_xinc){
- SwScale_YV12slice_brg24(src,stride,y,h,
-                         ImageData, image_width*((bpp+7)/8), image_width, ( depth == 24 ) ? bpp : depth,
+ uint8_t *dst[3] = {ImageData, NULL, NULL};
+ SwScale_YV12slice(src,stride,y,h,
+                         dst, image_width*((bpp+7)/8), image_width, ( depth == 24 ) ? bpp : depth,
 			 scale_xinc, scale_yinc);
 } else {
  uint8_t *dst=ImageData + ( image_width * y + x ) * ( bpp/8 );