[Mplayer-cvslog] CVS: main/libmpdemux asf_mmst_streaming.c,1.16,1.17 demux_ts.c,1.11,1.12 url.c,1.21,1.22

[Dominik Mierzejewski CVS]

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

Modified Files:
	asf_mmst_streaming.c demux_ts.c url.c 
Log Message:
Warning fixes (approved by A'rpi).


Index: asf_mmst_streaming.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/asf_mmst_streaming.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- asf_mmst_streaming.c	6 Nov 2003 22:34:20 -0000	1.16
+++ asf_mmst_streaming.c	8 Nov 2003 00:26:48 -0000	1.17
@@ -118,7 +118,7 @@
     size_t len1, len2;
     char *ip, *op;
 
-    if (url_conv != -1)
+    if (url_conv != (iconv_t)(-1))
     {
     memset(dest, 0, 1000);
     len1 = len; len2 = 1000;
@@ -588,7 +588,7 @@
   printf("mmst packet_length = %d\n",packet_length);
 
 #ifdef USE_ICONV
-  if (url_conv != -1)
+  if (url_conv != (iconv_t)(-1))
     iconv_close(url_conv);
 #endif
 

Index: demux_ts.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ts.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- demux_ts.c	20 Oct 2003 13:35:55 -0000	1.11
+++ demux_ts.c	8 Nov 2003 00:26:48 -0000	1.12
@@ -31,6 +31,7 @@
 
 #include "stream.h"
 #include "demuxer.h"
+#include "parse_es.h"
 #include "stheader.h"
 
 #include "bswap.h"

Index: url.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/url.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- url.c	3 May 2003 06:16:07 -0000	1.21
+++ url.c	8 Nov 2003 00:26:48 -0000	1.22
@@ -43,7 +43,7 @@
 	if( ptr1==NULL ) {
 	        // Check for a special case: "sip:" (without "//"):
 	        if (strstr(url, "sip:") == url) {
-		        ptr1 = &url[3]; // points to ':'
+		        ptr1 = (char *)&url[3]; // points to ':'
 			jumpSize = 1;
 		} else {
 		        mp_msg(MSGT_NETWORK,MSGL_V,"Not an URL!\n");