[MPlayer-cvslog] r30192 - in trunk: libmpcodecs/vf_scale.c libmpcodecs/vf_screenshot.c libvo/vo_aa.c libvo/vo_vesa.c libvo/vo_x11.c

[reimar]

Author: reimar
Date: Sun Jan  3 18:12:12 2010
New Revision: 30192

Log:
Replace deprecated sws_scale_ordered usages by sws_scale (which does the same).

Modified:
   trunk/libmpcodecs/vf_scale.c
   trunk/libmpcodecs/vf_screenshot.c
   trunk/libvo/vo_aa.c
   trunk/libvo/vo_vesa.c
   trunk/libvo/vo_x11.c

Modified: trunk/libmpcodecs/vf_scale.c
==============================================================================
--- trunk/libmpcodecs/vf_scale.c	Sun Jan  3 18:04:04 2010	(r30191)
+++ trunk/libmpcodecs/vf_scale.c	Sun Jan  3 18:12:12 2010	(r30192)
@@ -348,14 +348,14 @@ static void scale(struct SwsContext *sws
         int src_stride2[MP_MAX_PLANES]={2*src_stride[0], 2*src_stride[1], 2*src_stride[2], 2*src_stride[3]};
         int dst_stride2[MP_MAX_PLANES]={2*dst_stride[0], 2*dst_stride[1], 2*dst_stride[2], 2*dst_stride[3]};
 
-        sws_scale_ordered(sws1, src2, src_stride2, y>>1, h>>1, dst2, dst_stride2);
+        sws_scale(sws1, src2, src_stride2, y>>1, h>>1, dst2, dst_stride2);
         for(i=0; i<MP_MAX_PLANES; i++){
             src2[i] += src_stride[i];
             dst2[i] += dst_stride[i];
         }
-        sws_scale_ordered(sws2, src2, src_stride2, y>>1, h>>1, dst2, dst_stride2);
+        sws_scale(sws2, src2, src_stride2, y>>1, h>>1, dst2, dst_stride2);
     }else{
-        sws_scale_ordered(sws1, src2, src_stride, y, h, dst, dst_stride);
+        sws_scale(sws1, src2, src_stride, y, h, dst, dst_stride);
     }
 }
 

Modified: trunk/libmpcodecs/vf_screenshot.c
==============================================================================
--- trunk/libmpcodecs/vf_screenshot.c	Sun Jan  3 18:04:04 2010	(r30191)
+++ trunk/libmpcodecs/vf_screenshot.c	Sun Jan  3 18:12:12 2010	(r30192)
@@ -116,7 +116,7 @@ static void scale_image(struct vf_priv_s
         priv->buffer = memalign(16, dst_stride[0]*priv->dh);
 
     dst[0] = priv->buffer;
-    sws_scale_ordered(priv->ctx, mpi->planes, mpi->stride, 0, priv->dh, dst, dst_stride);
+    sws_scale(priv->ctx, mpi->planes, mpi->stride, 0, priv->dh, dst, dst_stride);
 }
 
 static void start_slice(struct vf_instance_s* vf, mp_image_t *mpi)
@@ -139,7 +139,7 @@ static void draw_slice(struct vf_instanc
         int dst_stride[MP_MAX_PLANES] = {0};
         dst_stride[0] = vf->priv->stride;
         dst[0] = vf->priv->buffer;
-        sws_scale_ordered(vf->priv->ctx, src, stride, y, h, dst, dst_stride);
+        sws_scale(vf->priv->ctx, src, stride, y, h, dst, dst_stride);
     }
     vf_next_draw_slice(vf,src,stride,w,h,x,y);
 }

Modified: trunk/libvo/vo_aa.c
==============================================================================
--- trunk/libvo/vo_aa.c	Sun Jan  3 18:04:04 2010	(r30191)
+++ trunk/libvo/vo_aa.c	Sun Jan  3 18:12:12 2010	(r30192)
@@ -353,7 +353,7 @@ draw_frame(uint8_t *src[]) {
     break;
   }
 
-  sws_scale_ordered(sws,src,stride,0,src_height,image,image_stride);
+  sws_scale(sws,src,stride,0,src_height,image,image_stride);
 
    /* Now 'ASCIInate' the image */
   if (fast)
@@ -373,7 +373,7 @@ draw_slice(uint8_t *src[], int stride[],
   int dx2 = screen_x + ((x+w) * screen_w / src_width);
   int dy2 = screen_y + ((y+h) * screen_h / src_height);
 
-  sws_scale_ordered(sws,src,stride,y,h,image,image_stride);
+  sws_scale(sws,src,stride,y,h,image,image_stride);
 
   /* Now 'ASCIInate' the image */
   if (fast)

Modified: trunk/libvo/vo_vesa.c
==============================================================================
--- trunk/libvo/vo_vesa.c	Sun Jan  3 18:04:04 2010	(r30191)
+++ trunk/libvo/vo_vesa.c	Sun Jan  3 18:12:12 2010	(r30192)
@@ -291,7 +291,7 @@ static int draw_slice(uint8_t *image[], 
     dstStride[1]=
     dstStride[2]=dstStride[0]>>1;
     if(HAS_DGA()) dst[0] += y_offset*SCREEN_LINE_SIZE(PIXEL_SIZE())+x_offset*PIXEL_SIZE();
-    sws_scale_ordered(sws,image,stride,y,h,dst,dstStride);
+    sws_scale(sws,image,stride,y,h,dst,dstStride);
     flip_trigger = 1;
     return 0;
 }
@@ -436,7 +436,7 @@ static int draw_frame(uint8_t *src[])
 	else
 	    srcStride[0] = srcW*2;
 	if(HAS_DGA()) dst[0] += y_offset*SCREEN_LINE_SIZE(PIXEL_SIZE())+x_offset*PIXEL_SIZE();
-	sws_scale_ordered(sws,src,srcStride,0,srcH,dst,dstStride);
+	sws_scale(sws,src,srcStride,0,srcH,dst,dstStride);
 	flip_trigger=1;
     }
     return 0;

Modified: trunk/libvo/vo_x11.c
==============================================================================
--- trunk/libvo/vo_x11.c	Sun Jan  3 18:04:04 2010	(r30191)
+++ trunk/libvo/vo_x11.c	Sun Jan  3 18:12:12 2010	(r30192)
@@ -565,7 +565,7 @@ static int draw_slice(uint8_t * src[], i
         dst[0] += dstStride[0] * (image_height - 1);
         dstStride[0] = -dstStride[0];
     }
-    sws_scale_ordered(swsContext, src, stride, y, h, dst, dstStride);
+    sws_scale(swsContext, src, stride, y, h, dst, dstStride);
     return 0;
 }