[Mplayer-cvslog] CVS: main/libvo sub.c,1.19,1.20

[Adam Tla/lka]

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

Modified Files:
	sub.c 
Log Message:

minor changes in sub.c


Index: sub.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/sub.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sub.c	16 Aug 2001 09:25:32 -0000	1.19
+++ sub.c	16 Aug 2001 11:36:13 -0000	1.20
@@ -16,8 +16,7 @@
         int x=20;
 
         while (*cp){
-          c=*cp;
-	  cp++;
+          c=*cp++;
           if ((font=vo_font->font[c])>=0)
             draw_alpha(x,y,
               vo_font->width[c],
@@ -36,16 +35,15 @@
 inline static void vo_draw_text_progbar(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)){
         int i;
         int y=(dys-vo_font->height)/2;
-        int x;
         int c,font;
-        int charw=vo_font->width[OSD_PB_0]+vo_font->charspace;
         int delimw=vo_font->width[OSD_PB_START]
-		      +vo_font->width[OSD_PB_END]
-		      +vo_font->charspace;
+     		  +vo_font->width[OSD_PB_END]
+     		  +vo_font->charspace;
         int width=(2*dxs-3*delimw)/3;
+   	int charw=vo_font->width[OSD_PB_0]+vo_font->charspace;
         int elems=width/charw;
+   	int x=(dxs-elems*charw-delimw)/2;
         int mark=(vo_osd_progbar_value*(elems+1))>>8;
-        x=(dxs-elems*charw-delimw)/2;
 
 //        printf("osd.progbar  width=%d  xpos=%d\n",width,x);