From de97a24d3fe00c9fef912f275b357a61a02b7396 Mon Sep 17 00:00:00 2001 From: ben Date: Sat, 7 Jun 2008 10:54:07 +0000 Subject: Drop support for external libvidix (unmaintained and not up-to-date) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27006 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vosub_vidix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libvo/vosub_vidix.c') diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c index 615199e66a..2b50e1c9da 100644 --- a/libvo/vosub_vidix.c +++ b/libvo/vosub_vidix.c @@ -645,7 +645,7 @@ int vidix_preinit(const char *drvname,vo_functions_t *server) return -1; } #ifndef __MINGW32__ - vidix_handler = vdlOpen(MP_VIDIX_PFX, + vidix_handler = vdlOpen(NULL, drvname ? drvname[0] == ':' ? &drvname[1] : drvname[0] ? drvname : NULL : NULL, TYPE_OUTPUT, verbose); -- cgit v1.2.3 From b7391dde399cd8a9557b7939a6965219ab4d3df2 Mon Sep 17 00:00:00 2001 From: ben Date: Sat, 7 Jun 2008 10:56:42 +0000 Subject: Drop some useless parameter from vidix init routine git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27007 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vosub_vidix.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'libvo/vosub_vidix.c') diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c index 2b50e1c9da..6451bb5806 100644 --- a/libvo/vosub_vidix.c +++ b/libvo/vosub_vidix.c @@ -645,13 +645,11 @@ int vidix_preinit(const char *drvname,vo_functions_t *server) return -1; } #ifndef __MINGW32__ - vidix_handler = vdlOpen(NULL, - drvname ? drvname[0] == ':' ? &drvname[1] : drvname[0] ? drvname : NULL : NULL, + vidix_handler = vdlOpen(drvname ? drvname[0] == ':' ? &drvname[1] : drvname[0] ? drvname : NULL : NULL, TYPE_OUTPUT, verbose); #else - vidix_handler = vdlOpen(get_path("vidix/"), - drvname ? drvname[0] == ':' ? &drvname[1] : drvname[0] ? drvname : NULL : NULL, + vidix_handler = vdlOpen(drvname ? drvname[0] == ':' ? &drvname[1] : drvname[0] ? drvname : NULL : NULL, TYPE_OUTPUT, verbose); #endif -- cgit v1.2.3 From 4e0801479054c5e0c68c5937871f862afb9ee8b7 Mon Sep 17 00:00:00 2001 From: ben Date: Sat, 7 Jun 2008 11:38:11 +0000 Subject: remove duplicated code git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27008 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vosub_vidix.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'libvo/vosub_vidix.c') diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c index 6451bb5806..52e318720d 100644 --- a/libvo/vosub_vidix.c +++ b/libvo/vosub_vidix.c @@ -644,15 +644,10 @@ int vidix_preinit(const char *drvname,vo_functions_t *server) mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_SUB_VIDIX_YouHaveWrongVersionOfVidixLibrary); return -1; } -#ifndef __MINGW32__ - vidix_handler = vdlOpen(drvname ? drvname[0] == ':' ? &drvname[1] : drvname[0] ? drvname : NULL : NULL, - TYPE_OUTPUT, - verbose); -#else + vidix_handler = vdlOpen(drvname ? drvname[0] == ':' ? &drvname[1] : drvname[0] ? drvname : NULL : NULL, TYPE_OUTPUT, verbose); -#endif if(vidix_handler == NULL) { -- cgit v1.2.3 From 6212ebbcae6dca6bd2c66a9dbf3db7f9a78ef072 Mon Sep 17 00:00:00 2001 From: ben Date: Sat, 7 Jun 2008 11:43:57 +0000 Subject: remove useless vidix versioning stuff git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27009 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vosub_vidix.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'libvo/vosub_vidix.c') diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c index 52e318720d..675ef9340f 100644 --- a/libvo/vosub_vidix.c +++ b/libvo/vosub_vidix.c @@ -639,11 +639,6 @@ int vidix_preinit(const char *drvname,vo_functions_t *server) int err; if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) { mp_msg(MSGT_VO,MSGL_DBG2, "vosub_vidix: vidix_preinit(%s) was called\n",drvname); } - if(vdlGetVersion() != VIDIX_VERSION) - { - mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_SUB_VIDIX_YouHaveWrongVersionOfVidixLibrary); - return -1; - } vidix_handler = vdlOpen(drvname ? drvname[0] == ':' ? &drvname[1] : drvname[0] ? drvname : NULL : NULL, TYPE_OUTPUT, -- cgit v1.2.3 From 4f99e1930014e7df0317b049a4ebe8ca08c09613 Mon Sep 17 00:00:00 2001 From: ben Date: Sat, 7 Jun 2008 12:02:56 +0000 Subject: declare some functions as static git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27014 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vosub_vidix.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libvo/vosub_vidix.c') diff --git a/libvo/vosub_vidix.c b/libvo/vosub_vidix.c index 675ef9340f..e821268cc3 100644 --- a/libvo/vosub_vidix.c +++ b/libvo/vosub_vidix.c @@ -212,7 +212,7 @@ static uint32_t vidix_draw_slice_packed(uint8_t *image[], int stride[], int w,in return 0; } -uint32_t vidix_draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y) +static uint32_t vidix_draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y) { mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_SUB_VIDIX_DummyVidixdrawsliceWasCalled); return -1; @@ -230,13 +230,13 @@ static uint32_t vidix_draw_image(mp_image_t *mpi){ return VO_TRUE; } -uint32_t vidix_draw_frame(uint8_t *image[]) +static uint32_t vidix_draw_frame(uint8_t *image[]) { mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_SUB_VIDIX_DummyVidixdrawframeWasCalled); return -1; } -void vidix_flip_page(void) +static void vidix_flip_page(void) { if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) { mp_msg(MSGT_VO,MSGL_DBG2, "vosub_vidix: vidix_flip_page() was called\n"); } @@ -297,7 +297,7 @@ static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned } } -void vidix_draw_osd(void) +static void vidix_draw_osd(void) { if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) { mp_msg(MSGT_VO,MSGL_DBG2, "vosub_vidix: vidix_draw_osd() was called\n"); } -- cgit v1.2.3