Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv30549/libvo Modified Files: vo_x11.c vo_vesa.c Log Message: swScale internally uses yuv2rgb now if possible Index: vo_x11.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- vo_x11.c 5 Feb 2002 19:54:38 -0000 1.57 +++ vo_x11.c 6 Feb 2002 20:52:14 -0000 1.58 @@ -501,7 +501,7 @@ dst[1]= dst[2]=NULL; - swScale(swsContext,src,stride,y,h,dst, dstStride); + swsContext->swScale(swsContext,src,stride,y,h,dst, dstStride); } else { uint8_t *dst=ImageData + ( image_width * y + x ) * ( bpp/8 ); if(image_format==IMGFMT_YV12) Index: vo_vesa.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_vesa.c,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- vo_vesa.c 6 Feb 2002 16:41:41 -0000 1.63 +++ vo_vesa.c 6 Feb 2002 20:52:14 -0000 1.64 @@ -262,7 +262,7 @@ dstStride[1]= dstStride[2]=dstStride[0]>>1; if(HAS_DGA()) dst[0] += y_offset*SCREEN_LINE_SIZE(PIXEL_SIZE())+x_offset*PIXEL_SIZE(); - (*swScale)(sws,image,stride,y,h,dst,dstStride); + sws->swScale(sws,image,stride,y,h,dst,dstStride); flip_trigger = 1; return 0; } @@ -371,7 +371,7 @@ else srcStride[0] = srcW*2; if(HAS_DGA()) dst[0] += y_offset*SCREEN_LINE_SIZE(PIXEL_SIZE())+x_offset*PIXEL_SIZE(); - (*swScale)(sws,src,srcStride,0,srcH,dst,dstStride); + sws->swScale(sws,src,srcStride,0,srcH,dst,dstStride); flip_trigger=1; } else if(!HAS_DGA()) __vbeCopyData(src[0]);