RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
reimar 2010-01-03 17:12:12 +00:00
parent 3b34c55178
commit ef395a2f08
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libmpcodecs/vf_scale.c
View File

@ -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 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]}; 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++){ for(i=0; i<MP_MAX_PLANES; i++){
src2[i] += src_stride[i]; src2[i] += src_stride[i];
dst2[i] += dst_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{ }else{
sws_scale_ordered(sws1, src2, src_stride, y, h, dst, dst_stride); sws_scale(sws1, src2, src_stride, y, h, dst, dst_stride);
} }
} }

4
libmpcodecs/vf_screenshot.c
View File

@ -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); priv->buffer = memalign(16, dst_stride[0]*priv->dh);
dst[0] = priv->buffer; 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) 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}; int dst_stride[MP_MAX_PLANES] = {0};
dst_stride[0] = vf->priv->stride; dst_stride[0] = vf->priv->stride;
dst[0] = vf->priv->buffer; 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); vf_next_draw_slice(vf,src,stride,w,h,x,y);
} }

4
libvo/vo_aa.c
View File

@ -353,7 +353,7 @@ draw_frame(uint8_t *src[]) {
break; 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 */ /* Now 'ASCIInate' the image */
if (fast) if (fast)
@ -373,7 +373,7 @@ draw_slice(uint8_t *src[], int stride[],
int dx2 = screen_x + ((x+w) * screen_w / src_width); int dx2 = screen_x + ((x+w) * screen_w / src_width);
int dy2 = screen_y + ((y+h) * screen_h / src_height); 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 */ /* Now 'ASCIInate' the image */
if (fast) if (fast)

4
libvo/vo_vesa.c
View File

@ -291,7 +291,7 @@ static int draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y)
dstStride[1]= dstStride[1]=
dstStride[2]=dstStride[0]>>1; dstStride[2]=dstStride[0]>>1;
if(HAS_DGA()) dst[0] += y_offset*SCREEN_LINE_SIZE(PIXEL_SIZE())+x_offset*PIXEL_SIZE(); 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; flip_trigger = 1;
return 0; return 0;
} }
@ -436,7 +436,7 @@ static int draw_frame(uint8_t *src[])
else else
srcStride[0] = srcW*2; srcStride[0] = srcW*2;
if(HAS_DGA()) dst[0] += y_offset*SCREEN_LINE_SIZE(PIXEL_SIZE())+x_offset*PIXEL_SIZE(); 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; flip_trigger=1;
} }
return 0; return 0;

2
libvo/vo_x11.c
View File

@ -565,7 +565,7 @@ static int draw_slice(uint8_t * src[], int stride[], int w, int h,
dst[0] += dstStride[0] * (image_height - 1); dst[0] += dstStride[0] * (image_height - 1);
dstStride[0] = -dstStride[0]; 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; return 0;
} }