diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-13 21:58:55 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-13 21:58:55 +0000 |
| commit | e84772b08dc87a64bd4b694cade91315c91debac (patch) | |
| tree | 320ffc40d1d74bf0d65b554b35a4f4aa0cd3e6e4 | |
| parent | d28c74a027c6e356cf3b5eda9a7cbcba6c89d3fe (diff) | |
| download | mpv-e84772b08dc87a64bd4b694cade91315c91debac.tar.bz2 mpv-e84772b08dc87a64bd4b694cade91315c91debac.tar.xz | |
compiler warning fixes
patch by Dominik Mierzejewski <dominik@rangers.eu.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7732 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libmpcodecs/dec_audio.h | 2 | ||||
| -rw-r--r-- | libmpcodecs/dec_video.h | 2 | ||||
| -rw-r--r-- | libmpcodecs/vf_vo.c | 2 | ||||
| -rw-r--r-- | libvo/x11_common.c | 2 | ||||
| -rw-r--r-- | mplayer.c | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/libmpcodecs/dec_audio.h b/libmpcodecs/dec_audio.h index cc44607dab..e9b341392f 100644 --- a/libmpcodecs/dec_audio.h +++ b/libmpcodecs/dec_audio.h @@ -13,4 +13,4 @@ extern void uninit_audio(sh_audio_t *sh_audio); 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); diff --git a/libmpcodecs/dec_video.h b/libmpcodecs/dec_video.h index c4865e43a2..34a8e0b3b4 100644 --- a/libmpcodecs/dec_video.h +++ b/libmpcodecs/dec_video.h @@ -15,7 +15,7 @@ extern int decode_video(sh_video_t *sh_video,unsigned char *start,int in_size,in 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); diff --git a/libmpcodecs/vf_vo.c b/libmpcodecs/vf_vo.c index 62e6d8bf6e..f6a92898b7 100644 --- a/libmpcodecs/vf_vo.c +++ b/libmpcodecs/vf_vo.c @@ -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){ diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 00e6408e82..a487973504 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -635,7 +635,7 @@ void vo_x11_setlayer( int layer ) Atom type; int format; unsigned long nitems, bytesafter; - Atom * args = NULL; + unsigned char * args = NULL; if ( WinID >= 0 ) return; @@ -1274,7 +1274,7 @@ if(sh_audio){ //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: |