Mercurial > mplayer.hg
changeset 25212:ca7a751f5481
Use proper type for vidix_preinit parameter instead of void *
author | reimar |
---|---|
date | Sun, 02 Dec 2007 13:37:15 +0000 |
parents | c1d17bd6683c |
children | 4a2b738ec787 |
files | libvo/vosub_vidix.c libvo/vosub_vidix.h |
diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vosub_vidix.c Sun Dec 02 13:22:53 2007 +0000 +++ b/libvo/vosub_vidix.c Sun Dec 02 13:37:15 2007 +0000 @@ -27,12 +27,12 @@ #include "mp_msg.h" #include "help_mp.h" -#include "vosub_vidix.h" #include "vidix/vidixlib.h" #include "fastmemcpy.h" #include "osd.h" #include "video_out.h" #include "sub.h" +#include "vosub_vidix.h" #include "libmpcodecs/vfcap.h" #include "libmpcodecs/mp_image.h" @@ -634,7 +634,7 @@ // return server_control(request,data); //VO_NOTIMPL; } -int vidix_preinit(const char *drvname,void *server) +int vidix_preinit(const char *drvname,vo_functions_t *server) { int err; if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) {
--- a/libvo/vosub_vidix.h Sun Dec 02 13:22:53 2007 +0000 +++ b/libvo/vosub_vidix.h Sun Dec 02 13:37:15 2007 +0000 @@ -13,7 +13,7 @@ #define VOSUB_VIDIX_H /* drvname can be NULL */ -int vidix_preinit(const char *drvname,void *server); +int vidix_preinit(const char *drvname,vo_functions_t *server); int vidix_init(unsigned src_width,unsigned src_height, unsigned dest_x,unsigned dest_y,unsigned dst_width, unsigned dst_height,unsigned format,unsigned dest_bpp,