Mercurial > mplayer.hg
changeset 26977:0e250247255f
remove useless vidix versioning stuff
| author | ben |
|---|---|
| date | Sat, 07 Jun 2008 11:43:57 +0000 |
| parents | 48d377ee42ac |
| children | 53ae66ee504e |
| files | libvo/vosub_vidix.c vidix/mach64_vid.c vidix/radeon_vid.c vidix/vidix.h vidix/vidixlib.c vidix/vidixlib.h |
| diffstat | 6 files changed, 0 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vosub_vidix.c Sat Jun 07 11:38:11 2008 +0000 +++ b/libvo/vosub_vidix.c Sat Jun 07 11:43:57 2008 +0000 @@ -639,11 +639,6 @@ 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,
--- a/vidix/mach64_vid.c Sat Jun 07 11:38:11 2008 +0000 +++ b/vidix/mach64_vid.c Sat Jun 07 11:43:57 2008 +0000 @@ -476,7 +476,6 @@ printf("[mach64] Driver was not probed but is being initializing\n"); return EINTR; } - if(verbosity > 0) printf("[mach64] version %d\n", VIDIX_VERSION); if((mach64_mmio_base = map_phys_mem(pci_info.base2,0x1000))==(void *)-1) return ENOMEM; mach64_wait_for_idle();
--- a/vidix/radeon_vid.c Sat Jun 07 11:38:11 2008 +0000 +++ b/vidix/radeon_vid.c Sat Jun 07 11:43:57 2008 +0000 @@ -1297,8 +1297,6 @@ { int err; - if(verbosity > 0) printf("[radeon_vid] version %d\n", VIDIX_VERSION); - if(!probed) { printf(RADEON_MSG" Driver was not probed but is being initializing\n");
--- a/vidix/vidix.h Sat Jun 07 11:38:11 2008 +0000 +++ b/vidix/vidix.h Sat Jun 07 11:43:57 2008 +0000 @@ -40,8 +40,6 @@ extern "C" { #endif -#define VIDIX_VERSION 100 - #define PROBE_NORMAL 0 /* normal probing */ #define PROBE_FORCE 1 /* ignore device_id but recognize device if it's known */
--- a/vidix/vidixlib.c Sat Jun 07 11:38:11 2008 +0000 +++ b/vidix/vidixlib.c Sat Jun 07 11:43:57 2008 +0000 @@ -44,11 +44,6 @@ #include "libavutil/common.h" #include "mpbswap.h" -extern unsigned int vdlGetVersion( void ) -{ - return VIDIX_VERSION; -} - VDL_HANDLE vdlOpen(const char *name,unsigned cap,int verbose) { VDXContext *ctx;
--- a/vidix/vidixlib.h Sat Jun 07 11:38:11 2008 +0000 +++ b/vidix/vidixlib.h Sat Jun 07 11:43:57 2008 +0000 @@ -74,9 +74,6 @@ typedef VDXContext * VDL_HANDLE; - /* returns library version */ -unsigned vdlGetVersion( void ); - /* Opens corresponded video driver and returns handle of associated stream. path - specifies path where drivers are located.