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 /libvo | |
| 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 'libvo')
| -rw-r--r-- | libvo/vo_aa.c | 4 | ||||
| -rw-r--r-- | libvo/vo_vesa.c | 4 | ||||
| -rw-r--r-- | libvo/vo_x11.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libvo/vo_aa.c b/libvo/vo_aa.c index 41d5de6294..cefd88c819 100644 --- a/libvo/vo_aa.c +++ b/libvo/vo_aa.c @@ -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) diff --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c index 5f58f5ddeb..b7376155d2 100644 --- a/libvo/vo_vesa.c +++ b/libvo/vo_vesa.c @@ -291,7 +291,7 @@ static int draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y) 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; diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 05762e5bbe..da08265760 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -565,7 +565,7 @@ static int draw_slice(uint8_t * src[], int stride[], int w, int h, 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; } |