Mercurial > mplayer.hg
changeset 10232:939ff11825de
Warning fixes, patch by Dominik Mierzejewski
| author | rtognimp |
|---|---|
| date | Sun, 01 Jun 2003 20:27:32 +0000 |
| parents | 4a9d046c94f2 |
| children | 35f52ad860a0 |
| files | libmpdemux/demux_realaud.c libmpdemux/pnm.c libmpdemux/realrtsp/xbuffer.c |
| diffstat | 3 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demux_realaud.c Sun Jun 01 13:39:49 2003 +0000 +++ b/libmpdemux/demux_realaud.c Sun Jun 01 20:27:32 2003 +0000 @@ -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; }
--- a/libmpdemux/pnm.c Sun Jun 01 13:39:49 2003 +0000 +++ b/libmpdemux/pnm.c Sun Jun 01 20:27:32 2003 +0000 @@ -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>