[Mplayer-cvslog] CVS: main/libmpdemux pnm.c,1.5,1.6 demux_realaud.c,1.3,1.4

[Roberto Togni CVS]

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

Modified Files:
	pnm.c demux_realaud.c 
Log Message:
Warning fixes, patch by Dominik Mierzejewski


Index: pnm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/pnm.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pnm.c	29 May 2003 19:33:33 -0000	1.5
+++ pnm.c	1 Jun 2003 20:27:07 -0000	1.6
@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <assert.h>
-//#include <sys/socket.h>
+#include <sys/socket.h>
 //#include <netinet/in.h>
 //#include <netdb.h>
 #include <string.h>

Index: demux_realaud.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_realaud.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- demux_realaud.c	17 May 2003 18:50:32 -0000	1.3
+++ demux_realaud.c	1 Jun 2003 20:27:07 -0000	1.4
@@ -92,7 +92,7 @@
 
 
 
-void demux_open_ra(demuxer_t* demuxer)
+int demux_open_ra(demuxer_t* demuxer)
 {
 	ra_priv_t* ra_priv = demuxer->priv;
 	sh_audio_t *sh;
@@ -101,7 +101,7 @@
 
   if ((ra_priv = (ra_priv_t *)malloc(sizeof(ra_priv_t))) == NULL) {
     mp_msg(MSGT_DEMUX, MSGL_ERR, "[RealAudio] Can't allocate memory for private data.\n");
-    return NULL;
+    return 0;
   }
 	memset(ra_priv, 0, sizeof(ra_priv_t));
 
@@ -116,7 +116,7 @@
 	if ((ra_priv->version < 3) || (ra_priv->version > 4)) {
 		mp_msg(MSGT_DEMUX,MSGL_WARN,"[RealAudio] ra version %d is not supported yet, please "
 			"contact MPlayer developers\n", ra_priv->version);
-		return NULL;
+		return 0;
 	}
 	if (ra_priv->version == 3) {
 		ra_priv->hdr_size = stream_read_word(demuxer->stream);
@@ -255,6 +255,8 @@
 
 	if(!ds_fill_buffer(demuxer->audio))
 		mp_msg(MSGT_DEMUXER,MSGL_INFO,"[RealAudio] No data.\n");
+
+    return 1;
 }