Mercurial > mplayer.hg
changeset 7731:1f8961f2b34c
compiler warning fixes
patch by Dominik Mierzejewski <dominik@rangers.eu.org>
| author | arpi |
|---|---|
| date | Sun, 13 Oct 2002 21:58:55 +0000 |
| parents | 8ead080de60c |
| children | 328bbac6224c |
| files | libmpcodecs/dec_audio.h libmpcodecs/dec_video.h libmpcodecs/vf_vo.c libvo/x11_common.c mplayer.c |
| diffstat | 5 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/dec_audio.h Sun Oct 13 21:57:54 2002 +0000 +++ b/libmpcodecs/dec_audio.h Sun Oct 13 21:58:55 2002 +0000 @@ -13,4 +13,4 @@ extern int init_audio_filters(sh_audio_t *sh_audio, int in_samplerate, int in_channels, int in_format, int in_bps, int out_samplerate, int out_channels, int out_format, int out_bps, - int out_minsize, int out_maxsize); \ No newline at end of file + int out_minsize, int out_maxsize);
--- a/libmpcodecs/dec_video.h Sun Oct 13 21:57:54 2002 +0000 +++ b/libmpcodecs/dec_video.h Sun Oct 13 21:58:55 2002 +0000 @@ -15,7 +15,7 @@ extern int get_video_quality_max(sh_video_t *sh_video); extern void set_video_quality(sh_video_t *sh_video,int quality); -int get_video_colors(sh_video_t *sh_video,char *item,int *value); +extern int get_video_colors(sh_video_t *sh_video,char *item,int *value); extern int set_video_colors(sh_video_t *sh_video,char *item,int value); extern int set_rectangle(sh_video_t *sh_video,int param,int value);
--- a/libmpcodecs/vf_vo.c Sun Oct 13 21:57:54 2002 +0000 +++ b/libmpcodecs/vf_vo.c Sun Oct 13 21:58:55 2002 +0000 @@ -14,6 +14,8 @@ #define video_out ((vo_functions_t*)(vf->priv)) +static int query_format(struct vf_instance_s* vf, unsigned int fmt); /* forward declaration */ + static int config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){
--- a/libvo/x11_common.c Sun Oct 13 21:57:54 2002 +0000 +++ b/libvo/x11_common.c Sun Oct 13 21:58:55 2002 +0000 @@ -635,7 +635,7 @@ Atom type; int format; unsigned long nitems, bytesafter; - Atom * args = NULL; + unsigned char * args = NULL; if ( WinID >= 0 ) return;
--- a/mplayer.c Sun Oct 13 21:57:54 2002 +0000 +++ b/mplayer.c Sun Oct 13 21:58:55 2002 +0000 @@ -1274,7 +1274,7 @@ //const ao_info_t *info=audio_out->info; current_module="ao2_init"; if(!(audio_out=init_best_audio_out(audio_driver_list, - (ao_plugin_cfg.plugin_list), // plugin flag + (ao_plugin_cfg.plugin_list!=NULL), // plugin flag force_srate?force_srate:sh_audio->samplerate*playback_speed, audio_output_channels?audio_output_channels: sh_audio->channels,audio_output_format?audio_output_format: