diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-26 11:03:12 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-26 11:03:12 +0300 |
commit | 529d1066274fc24c6a7ca5a8230c198167a5f7c0 (patch) | |
tree | e773cd75f724f30fd9c18244392d89670fe4a9f0 /mplayer.c | |
parent | fb33e286b5c23dbe8d0aeaf63cd3490bed3906e3 (diff) | |
download | mpv-529d1066274fc24c6a7ca5a8230c198167a5f7c0.tar.bz2 mpv-529d1066274fc24c6a7ca5a8230c198167a5f7c0.tar.xz |
Silence "discards qualifiers" warnings when compiling mplayer.c
Add casts to subconfig entries in option lists to avoid the excessive
amount of "initialization discards qualifiers from pointer target
type" warnings. Also add const to the type of mpctx_get_audio_out to
eliminate a warning and make it match the type in the header (svn
r25793 had added a const to the header but not mplayer.c). Make
libmenu_vfs a table of pointers to const to eliminate another warning
plus make the table itself const.
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -306,7 +306,7 @@ char* current_module=NULL; // for debugging #include "libmenu/menu.h" extern void vf_menu_pause_update(struct vf_instance* vf); extern vf_info_t vf_info_menu; -static vf_info_t* libmenu_vfs[] = { +static const vf_info_t* const libmenu_vfs[] = { &vf_info_menu, NULL }; @@ -341,7 +341,7 @@ const void *mpctx_get_video_out(MPContext *mpctx) return mpctx->video_out; } -void *mpctx_get_audio_out(MPContext *mpctx) +const void *mpctx_get_audio_out(MPContext *mpctx) { return mpctx->audio_out; } |