diff libvo/vo_x11.c @ 9697:5025150738eb

10000l (YUV vs. YVU swscale fix/cleanup)
author michael
date Thu, 27 Mar 2003 16:04:53 +0000
parents 543ab3909b78
children 69bb88bc869b
line wrap: on
line diff
--- a/libvo/vo_x11.c	Wed Mar 26 23:59:07 2003 +0000
+++ b/libvo/vo_x11.c	Thu Mar 27 16:04:53 2003 +0000
@@ -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;
 }