diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 02:06:42 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 02:06:42 +0200 |
| commit | 17eb7f2c4bb070d9477792fcbd4a5120ee1a789c (patch) | |
| tree | 702cfe702169effb14fbabb3f50d289c1683147d /libvo/vo_vesa.c | |
| parent | ff3ef4e7827424db7444cdb7973faa499e054ac5 (diff) | |
| parent | eb6fc7e99e07712b74c17c917aa33704ef6e410a (diff) | |
| download | mpv-17eb7f2c4bb070d9477792fcbd4a5120ee1a789c.tar.bz2 mpv-17eb7f2c4bb070d9477792fcbd4a5120ee1a789c.tar.xz | |
Merge svn changes up to r30195
Diffstat (limited to 'libvo/vo_vesa.c')
| -rw-r--r-- | libvo/vo_vesa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c index 1ab3cdd184..1dd328149b 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; |