Mercurial > mplayer.hg
changeset 22142:84f95595f31f
Fix a few gcc warnings, approved by Diego and Reimar.
| author | rathann |
|---|---|
| date | Mon, 05 Feb 2007 23:46:08 +0000 |
| parents | ed81b9614148 |
| children | be16314071fe |
| files | libao2/ao_polyp.c libmpdemux/demuxer.c libmpdemux/muxer_mpeg.c libvo/mga_common.c stream/cache2.c stream/network.c stream/tcp.c |
| diffstat | 7 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libao2/ao_polyp.c Mon Feb 05 23:25:50 2007 +0000 +++ b/libao2/ao_polyp.c Mon Feb 05 23:46:08 2007 +0000 @@ -246,8 +246,8 @@ /** Return the current latency in seconds */ static float get_delay(void) { + pa_usec_t latency; assert(stream && context && pa_stream_get_state(stream) == PA_STREAM_READY); - pa_usec_t latency; /* latency = 0; */ /* wait_for_operation(pa_stream_get_latency(stream, latency_func, NULL)); */
--- a/libmpdemux/demuxer.c Mon Feb 05 23:25:50 2007 +0000 +++ b/libmpdemux/demuxer.c Mon Feb 05 23:46:08 2007 +0000 @@ -22,6 +22,7 @@ #include "libaf/af_format.h" +extern void resync_video_stream(sh_video_t *sh_video); extern void resync_audio_stream(sh_audio_t *sh_audio); // Demuxer list
--- a/libmpdemux/muxer_mpeg.c Mon Feb 05 23:25:50 2007 +0000 +++ b/libmpdemux/muxer_mpeg.c Mon Feb 05 23:46:08 2007 +0000 @@ -872,7 +872,7 @@ } } -static int update_demux_bufsize(muxer_headers_t *spriv, uint64_t dts, int framelen, int type) +static void update_demux_bufsize(muxer_headers_t *spriv, uint64_t dts, int framelen, int type) { int dim = (spriv->track_len+16)*sizeof(buffer_track_t); @@ -882,7 +882,7 @@ if(!tmp) { mp_msg(MSGT_MUXER, MSGL_ERR, "\r\nERROR, couldn't realloc %d bytes for tracking buffer\r\n", dim); - return 0; + return; } spriv->buffer_track = tmp; memset(&(spriv->buffer_track[spriv->track_pos+1]), 0, 16*sizeof(buffer_track_t));
--- a/libvo/mga_common.c Mon Feb 05 23:25:50 2007 +0000 +++ b/libvo/mga_common.c Mon Feb 05 23:46:08 2007 +0000 @@ -2,6 +2,7 @@ #include "fastmemcpy.h" #include "cpudetect.h" #include "libswscale/swscale.h" +#include "libswscale/rgb2rgb.h" #include "libmpcodecs/vf_scale.h" #include "mp_msg.h" #include "help_mp.h"
--- a/stream/cache2.c Mon Feb 05 23:25:50 2007 +0000 +++ b/stream/cache2.c Mon Feb 05 23:46:08 2007 +0000 @@ -28,12 +28,11 @@ #include "help_mp.h" #include "stream.h" +#include "input/input.h" int stream_fill_buffer(stream_t *s); int stream_seek_long(stream_t *s,off_t pos); -extern int mp_input_check_interrupt(int time); - typedef struct { // constats: unsigned char *buffer; // base pointer of the alllocated buffer memory
--- a/stream/network.c Mon Feb 05 23:25:50 2007 +0000 +++ b/stream/network.c Mon Feb 05 23:46:08 2007 +0000 @@ -40,8 +40,6 @@ extern int stream_cache_size; -extern int mp_input_check_interrupt(int time); - /* Variables for the command line option -user, -passwd, -bandwidth, -user-agent and -nocookies */