[Mplayer-cvslog] CVS: main/libvo vo_aa.c,1.38,1.39

[Michael Niedermayer CVS]

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv28483

Modified Files:
	vo_aa.c 
Log Message:
100l


Index: vo_aa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_aa.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- vo_aa.c	9 Feb 2003 20:18:23 -0000	1.38
+++ vo_aa.c	23 Feb 2003 23:34:16 -0000	1.39
@@ -79,7 +79,7 @@
 #ifdef USE_OSD
 font_desc_t* vo_font_save = NULL;
 #endif
-static SwsContext *sws=NULL;
+static struct SwsContext *sws=NULL;
 extern m_config_t *mconfig;
 
 /* our version of the playmodes :) */
@@ -119,8 +119,8 @@
     screen_x = (aa_scrwidth(c) - screen_w) / 2;
     screen_y = (aa_scrheight(c) - screen_h) / 2;
     
-    if(sws) freeSwsContext(sws);
-    sws = getSwsContextFromCmdLine(src_width,src_height,image_format,
+    if(sws) sws_freeContext(sws);
+    sws = sws_getContextFromCmdLine(src_width,src_height,image_format,
 				   image_width,image_height,IMGFMT_Y8);
 
     image[0] = aa_image(c) + image_y * aa_imgwidth(c) + image_x;
@@ -360,7 +360,7 @@
     break;
   }
 
-  sws->swScale(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)
@@ -380,7 +380,7 @@
   int dx2 = screen_x + ((x+w) * screen_w / src_width);
   int dy2 = screen_y + ((y+h) * screen_h / src_height);
 
-  sws->swScale(sws,src,stride,y,h,image,image_stride);
+  sws_scale(sws,src,stride,y,h,image,image_stride);
 
   /* Now 'ASCIInate' the image */ 
   if (fast)