[Mplayer-cvslog] CVS: main mencoder.c,1.188,1.189 subreader.h,1.21,1.22 unrarlib.c,1.1,1.2

[Arpi of Ize]

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

Modified Files:
	mencoder.c subreader.h unrarlib.c 
Log Message:
compiler warning fixes
based on patch by Dominik Mierzejewski <dominik at rangers.eu.org>


Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- mencoder.c	5 Dec 2002 00:03:26 -0000	1.188
+++ mencoder.c	14 Dec 2002 17:54:59 -0000	1.189
@@ -1281,7 +1281,7 @@
         
         end_at_type = END_AT_SIZE;
 
-        if(sscanf(param, "%d%3s", &end_at, unit) == 2) {
+        if(sscanf(param, "%lf%3s", &end_at, unit) == 2) {
             if(!strcasecmp(unit, "b"))
                 ;
             else if(!strcasecmp(unit, "kb"))

Index: subreader.h
===================================================================
RCS file: /cvsroot/mplayer/main/subreader.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- subreader.h	5 Dec 2002 00:15:56 -0000	1.21
+++ subreader.h	14 Dec 2002 17:54:59 -0000	1.22
@@ -43,6 +43,8 @@
 void dump_srt(subtitle* subs, float fps);
 void dump_mpsub(subtitle* subs, float fps);
 void dump_microdvd(subtitle* subs, float fps);
+void dump_jacosub(subtitle* subs, float fps);
+void dump_sami(subtitle* subs, float fps);
 void sub_free( subtitle * subs );
 void find_sub(subtitle* subtitles,int key);
 void step_sub(subtitle *subtitles, float pts, int movement);

Index: unrarlib.c
===================================================================
RCS file: /cvsroot/mplayer/main/unrarlib.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- unrarlib.c	20 Sep 2002 01:26:39 -0000	1.1
+++ unrarlib.c	14 Dec 2002 17:54:59 -0000	1.2
@@ -1676,7 +1676,10 @@
       UnpReadBuf(0);
     DecodeNumber((struct Decode *)&BD);
     if (Number<16)
-      Table[I++]=(Number+UnpOldTable[I]) & 0xf;
+    {
+      Table[I]=(Number+UnpOldTable[I]) & 0xf;
+      I++;
+    }
     else
       if (Number==16)
       {