diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-03 17:12:12 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-03 17:12:12 +0000 |
commit | ef395a2f08e0f96d8ae5f819927b17aa88000ecb (patch) | |
tree | 3ed5f95bd3947ca989a6947000b630ac18ba482c /libmpcodecs | |
parent | 3b34c5517852c13a76fe6f3af5848b4390ef74b2 (diff) | |
download | mpv-ef395a2f08e0f96d8ae5f819927b17aa88000ecb.tar.bz2 mpv-ef395a2f08e0f96d8ae5f819927b17aa88000ecb.tar.xz |
Replace deprecated sws_scale_ordered usages by sws_scale (which does the same).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30192 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/vf_scale.c | 6 | ||||
-rw-r--r-- | libmpcodecs/vf_screenshot.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c index e32d403538..914ad7982c 100644 --- a/libmpcodecs/vf_scale.c +++ b/libmpcodecs/vf_scale.c @@ -348,14 +348,14 @@ static void scale(struct SwsContext *sws1, struct SwsContext *sws2, uint8_t *src 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 --git a/libmpcodecs/vf_screenshot.c b/libmpcodecs/vf_screenshot.c index 2200b6a9d8..38cfa2e85f 100644 --- a/libmpcodecs/vf_screenshot.c +++ b/libmpcodecs/vf_screenshot.c @@ -116,7 +116,7 @@ static void scale_image(struct vf_priv_s* priv, mp_image_t *mpi) 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_instance_s* vf, unsigned char** src, 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); } |