# HG changeset patch
# User reimar
# Date 1262538732 0
# Node ID 16c71b965952490e43a1d0756192ab55891f8ec4
# Parent  5f8cbd711a045ec64313279fa3c850e2eb5cf224
Replace deprecated sws_scale_ordered usages by sws_scale (which does the same).

diff -r 5f8cbd711a04 -r 16c71b965952 libmpcodecs/vf_scale.c
--- a/libmpcodecs/vf_scale.c	Sun Jan 03 17:04:04 2010 +0000
+++ b/libmpcodecs/vf_scale.c	Sun Jan 03 17:12:12 2010 +0000
@@ -348,14 +348,14 @@
         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);
     }
 }
 
diff -r 5f8cbd711a04 -r 16c71b965952 libmpcodecs/vf_screenshot.c
--- a/libmpcodecs/vf_screenshot.c	Sun Jan 03 17:04:04 2010 +0000
+++ b/libmpcodecs/vf_screenshot.c	Sun Jan 03 17:12:12 2010 +0000
@@ -116,7 +116,7 @@
         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 @@
         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);
 }
diff -r 5f8cbd711a04 -r 16c71b965952 libvo/vo_aa.c
--- a/libvo/vo_aa.c	Sun Jan 03 17:04:04 2010 +0000
+++ b/libvo/vo_aa.c	Sun Jan 03 17:12:12 2010 +0000
@@ -353,7 +353,7 @@
     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 @@
   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)
diff -r 5f8cbd711a04 -r 16c71b965952 libvo/vo_vesa.c
--- a/libvo/vo_vesa.c	Sun Jan 03 17:04:04 2010 +0000
+++ b/libvo/vo_vesa.c	Sun Jan 03 17:12:12 2010 +0000
@@ -291,7 +291,7 @@
     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 @@
 	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;
diff -r 5f8cbd711a04 -r 16c71b965952 libvo/vo_x11.c
--- a/libvo/vo_x11.c	Sun Jan 03 17:04:04 2010 +0000
+++ b/libvo/vo_x11.c	Sun Jan 03 17:12:12 2010 +0000
@@ -565,7 +565,7 @@
         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;
 }