diff options
| author | rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-06-01 20:27:32 +0000 |
|---|---|---|
| committer | rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-06-01 20:27:32 +0000 |
| commit | 56d2da5af429840315d53c26aee476c7b8c2a2ce (patch) | |
| tree | 33f279fba120ae49fca3e8470d04c80e3ffd2b98 /libmpdemux | |
| parent | cb1229a849ddcf8b8f26430512e03cbb0783a6fa (diff) | |
| download | mpv-56d2da5af429840315d53c26aee476c7b8c2a2ce.tar.bz2 mpv-56d2da5af429840315d53c26aee476c7b8c2a2ce.tar.xz | |
Warning fixes, patch by Dominik Mierzejewski
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10233 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_realaud.c | 8 | ||||
| -rw-r--r-- | libmpdemux/pnm.c | 2 | ||||
| -rw-r--r-- | libmpdemux/realrtsp/xbuffer.c | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/libmpdemux/demux_realaud.c b/libmpdemux/demux_realaud.c index 96469a8279..e68b3069a7 100644 --- a/libmpdemux/demux_realaud.c +++ b/libmpdemux/demux_realaud.c @@ -92,7 +92,7 @@ extern void print_wave_header(WAVEFORMATEX *h); -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 @@ void demux_open_ra(demuxer_t* demuxer) 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 @@ void demux_open_ra(demuxer_t* demuxer) 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 @@ void demux_open_ra(demuxer_t* demuxer) if(!ds_fill_buffer(demuxer->audio)) mp_msg(MSGT_DEMUXER,MSGL_INFO,"[RealAudio] No data.\n"); + + return 1; } diff --git a/libmpdemux/pnm.c b/libmpdemux/pnm.c index c5368f2f98..6a9b5ea38b 100644 --- a/libmpdemux/pnm.c +++ b/libmpdemux/pnm.c @@ -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> diff --git a/libmpdemux/realrtsp/xbuffer.c b/libmpdemux/realrtsp/xbuffer.c index 594f676583..66f99c4b32 100644 --- a/libmpdemux/realrtsp/xbuffer.c +++ b/libmpdemux/realrtsp/xbuffer.c @@ -14,6 +14,7 @@ */ #include <stdlib.h> +#include <string.h> #include <inttypes.h> #include "xbuffer.h" |