[Mplayer-cvslog] CVS: main/libvo vo_x11.c,1.127,1.128 vo_aa.c,1.39,1.40

[Michael Niedermayer CVS]

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

Modified Files:
	vo_x11.c vo_aa.c 
Log Message:
10000l (YUV vs. YVU swscale fix/cleanup)


Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- vo_x11.c	23 Feb 2003 22:05:55 -0000	1.127
+++ vo_x11.c	27 Mar 2003 16:04:30 -0000	1.128
@@ -241,7 +241,6 @@
     title = strdup("MPlayer X11 (XImage/Shm) render");
 
  in_format=format;
- if(in_format==IMGFMT_I420 || in_format==IMGFMT_IYUV) in_format=IMGFMT_YV12;
  srcW= width;
  srcH= height;
  vo_dx=( vo_screenwidth - d_width ) / 2; vo_dy=( vo_screenheight - d_height ) / 2;
@@ -508,13 +507,13 @@
   {
 	dstStride[0]= -image_width*((bpp+7)/8);
 	dst[0]=ImageData - dstStride[0]*(image_height-1);
-	sws_scale(swsContext,src,stride,y,h,dst, dstStride);
+	sws_scale_ordered(swsContext,src,stride,y,h,dst, dstStride);
   }
   else
   {
 	dstStride[0]=image_width*((bpp+7)/8);
 	dst[0]=ImageData;
-	sws_scale(swsContext,src,stride,y,h,dst, dstStride);
+	sws_scale_ordered(swsContext,src,stride,y,h,dst, dstStride);
   }
   return 0;
 }

Index: vo_aa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_aa.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- vo_aa.c	23 Feb 2003 23:34:16 -0000	1.39
+++ vo_aa.c	27 Mar 2003 16:04:30 -0000	1.40
@@ -360,7 +360,7 @@
     break;
   }
 
-  sws_scale(sws,src,stride,0,src_height,image,image_stride);
+  sws_scale_ordered(sws,src,stride,0,src_height,image,image_stride);
 
    /* Now 'ASCIInate' the image */ 
   if (fast)
@@ -380,7 +380,7 @@
   int dx2 = screen_x + ((x+w) * screen_w / src_width);
   int dy2 = screen_y + ((y+h) * screen_h / src_height);
 
-  sws_scale(sws,src,stride,y,h,image,image_stride);
+  sws_scale_ordered(sws,src,stride,y,h,image,image_stride);
 
   /* Now 'ASCIInate' the image */ 
   if (fast)