diff options
| author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-27 16:04:53 +0000 |
|---|---|---|
| committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-27 16:04:53 +0000 |
| commit | 20faf3dc0d48c4daf2f29322f961ed18b6d82ae4 (patch) | |
| tree | 06cf4c4f6cec1379c33f22f1b3dc06f55a70d66c /libvo | |
| parent | ba39e1594824d05ef32d6c7457b5c2250c7be250 (diff) | |
| download | mpv-20faf3dc0d48c4daf2f29322f961ed18b6d82ae4.tar.bz2 mpv-20faf3dc0d48c4daf2f29322f961ed18b6d82ae4.tar.xz | |
10000l (YUV vs. YVU swscale fix/cleanup)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9698 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_aa.c | 4 | ||||
| -rw-r--r-- | libvo/vo_x11.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/libvo/vo_aa.c b/libvo/vo_aa.c index 770a1c45ec..a8ee832b39 100644 --- a/libvo/vo_aa.c +++ b/libvo/vo_aa.c @@ -360,7 +360,7 @@ draw_frame(uint8_t *src[]) { break; } - sws_scale(sws,src,stride,0,src_height,image,image_stride); + sws_scale_ordered(sws,src,stride,0,src_height,image,image_stride); /* Now 'ASCIInate' the image */ if (fast) @@ -380,7 +380,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(sws,src,stride,y,h,image,image_stride); + sws_scale_ordered(sws,src,stride,y,h,image,image_stride); /* Now 'ASCIInate' the image */ if (fast) diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 0306f06f0d..8953b73646 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -241,7 +241,6 @@ static uint32_t config( uint32_t width,uint32_t height,uint32_t d_width,uint32_t title = strdup("MPlayer X11 (XImage/Shm) render"); in_format=format; - if(in_format==IMGFMT_I420 || in_format==IMGFMT_IYUV) in_format=IMGFMT_YV12; srcW= width; srcH= height; vo_dx=( vo_screenwidth - d_width ) / 2; vo_dy=( vo_screenheight - d_height ) / 2; @@ -508,13 +507,13 @@ static uint32_t draw_slice( uint8_t *src[],int stride[],int w,int h,int x,int y { dstStride[0]= -image_width*((bpp+7)/8); dst[0]=ImageData - dstStride[0]*(image_height-1); - sws_scale(swsContext,src,stride,y,h,dst, dstStride); + sws_scale_ordered(swsContext,src,stride,y,h,dst, dstStride); } else { dstStride[0]=image_width*((bpp+7)/8); dst[0]=ImageData; - sws_scale(swsContext,src,stride,y,h,dst, dstStride); + sws_scale_ordered(swsContext,src,stride,y,h,dst, dstStride); } return 0; } |