summaryrefslogtreecommitdiffstats
path: root/libvo/video_out.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-12-02 14:24:23 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-12-02 14:24:23 +0000
commit844c8ffc48c7e7715c43a1290188f5bdfa289821 (patch)
tree84f08c54b7cce8b02b146221488939235da9fe28 /libvo/video_out.c
parentbbab104b7e5238c510f51a8e671b3d8f4fcbfa0a (diff)
downloadmpv-844c8ffc48c7e7715c43a1290188f5bdfa289821.tar.bz2
mpv-844c8ffc48c7e7715c43a1290188f5bdfa289821.tar.xz
Mark several uses of vo_functions_t as const to stop some of the current
hacks e.g. in vidix code from spreading. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25247 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/video_out.c')
-rw-r--r--libvo/video_out.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c
index 53aeb3eca1..98feb468d7 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -147,7 +147,7 @@ extern vo_functions_t video_out_pnm;
extern vo_functions_t video_out_md5sum;
#endif
-vo_functions_t* video_out_drivers[] =
+const vo_functions_t* const video_out_drivers[] =
{
#ifdef HAVE_XVR100
&video_out_xvr100,
@@ -288,7 +288,7 @@ void list_video_out(void){
mp_msg(MSGT_GLOBAL, MSGL_INFO,"\n");
}
-vo_functions_t* init_best_video_out(char** vo_list){
+const vo_functions_t* init_best_video_out(char** vo_list){
int i;
// first try the preferred drivers, with their optional subdevice param:
if(vo_list && vo_list[0])
@@ -304,7 +304,7 @@ vo_functions_t* init_best_video_out(char** vo_list){
++vo_subdevice;
}
for(i=0;video_out_drivers[i];i++){
- vo_functions_t* video_driver=video_out_drivers[i];
+ const vo_functions_t* video_driver=video_out_drivers[i];
const vo_info_t *info = video_driver->info;
if(!strcmp(info->short_name,vo)){
// name matches, try it
@@ -323,14 +323,14 @@ vo_functions_t* init_best_video_out(char** vo_list){
// now try the rest...
vo_subdevice=NULL;
for(i=0;video_out_drivers[i];i++){
- vo_functions_t* video_driver=video_out_drivers[i];
+ const vo_functions_t* video_driver=video_out_drivers[i];
if(!video_driver->preinit(vo_subdevice))
return video_driver; // success!
}
return NULL;
}
-int config_video_out(vo_functions_t *vo, uint32_t width, uint32_t height,
+int config_video_out(const vo_functions_t *vo, uint32_t width, uint32_t height,
uint32_t d_width, uint32_t d_height, uint32_t flags,
char *title, uint32_t format) {
panscan_init();