From fda4dce8a074ef98cc215eb11082464c647fbb67 Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 19 Jan 2008 11:33:36 +0000 Subject: [PATCH] audio_out / video_out structs should be treated as const git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25793 b3059339-0415-0410-9bf9-f77b7e298cf2 --- access_mpcontext.h | 4 ++-- gui/interface.c | 2 +- gui/win32/interface.c | 4 ++-- mplayer.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/access_mpcontext.h b/access_mpcontext.h index e15ed6c885..a4878b2d9b 100644 --- a/access_mpcontext.h +++ b/access_mpcontext.h @@ -2,8 +2,8 @@ #define ACCESS_MPCONTEXT_H struct MPContext; -void *mpctx_get_video_out(struct MPContext *mpctx); -void *mpctx_get_audio_out(struct MPContext *mpctx); +const void *mpctx_get_video_out(struct MPContext *mpctx); +const void *mpctx_get_audio_out(struct MPContext *mpctx); void *mpctx_get_demuxer(struct MPContext *mpctx); void *mpctx_get_playtree_iter(struct MPContext *mpctx); void *mpctx_get_mixer(struct MPContext *mpctx); diff --git a/gui/interface.c b/gui/interface.c index ce89174205..283a83816b 100644 --- a/gui/interface.c +++ b/gui/interface.c @@ -506,7 +506,7 @@ static void remove_vf( char * str ) int guiGetEvent( int type,char * arg ) { - ao_functions_t *audio_out = NULL; + const ao_functions_t *audio_out = NULL; const vo_functions_t *video_out = NULL; mixer_t *mixer = NULL; diff --git a/gui/win32/interface.c b/gui/win32/interface.c index d877206620..ee360c883d 100644 --- a/gui/win32/interface.c +++ b/gui/win32/interface.c @@ -61,8 +61,8 @@ static RECT old_rect; static DWORD style; static HANDLE hThread; static unsigned threadId; -ao_functions_t *audio_out = NULL; -vo_functions_t *video_out = NULL; +const ao_functions_t *audio_out = NULL; +const vo_functions_t *video_out = NULL; mixer_t *mixer = NULL; /* test for playlist files, no need to specify -playlist on the commandline. diff --git a/mplayer.c b/mplayer.c index d5af904245..3364018fd8 100644 --- a/mplayer.c +++ b/mplayer.c @@ -375,7 +375,7 @@ static unsigned int inited_flags=0; #define mp_basename2(s) (strrchr(s,'/')==NULL?(char*)s:(strrchr(s,'/')+1)) -void *mpctx_get_video_out(MPContext *mpctx) +const void *mpctx_get_video_out(MPContext *mpctx) { return mpctx->video_out; }