[MPlayer-cvslog] r27009 - in trunk: libvo/vosub_vidix.c vidix/mach64_vid.c vidix/radeon_vid.c vidix/vidix.h vidix/vidixlib.c vidix/vidixlib.h

[ben]

Author: ben
Date: Sat Jun  7 13:43:57 2008
New Revision: 27009

Log:
remove useless vidix versionning stuff

Modified:
   trunk/libvo/vosub_vidix.c
   trunk/vidix/mach64_vid.c
   trunk/vidix/radeon_vid.c
   trunk/vidix/vidix.h
   trunk/vidix/vidixlib.c
   trunk/vidix/vidixlib.h

Modified: trunk/libvo/vosub_vidix.c
==============================================================================
--- trunk/libvo/vosub_vidix.c	(original)
+++ trunk/libvo/vosub_vidix.c	Sat Jun  7 13:43:57 2008
@@ -639,11 +639,6 @@ int vidix_preinit(const char *drvname,vo
   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,

Modified: trunk/vidix/mach64_vid.c
==============================================================================
--- trunk/vidix/mach64_vid.c	(original)
+++ trunk/vidix/mach64_vid.c	Sat Jun  7 13:43:57 2008
@@ -476,7 +476,6 @@ static int mach64_init(void)
     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();

Modified: trunk/vidix/radeon_vid.c
==============================================================================
--- trunk/vidix/radeon_vid.c	(original)
+++ trunk/vidix/radeon_vid.c	Sat Jun  7 13:43:57 2008
@@ -1297,8 +1297,6 @@ static int radeon_init(void)
 {
   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");

Modified: trunk/vidix/vidix.h
==============================================================================
--- trunk/vidix/vidix.h	(original)
+++ trunk/vidix/vidix.h	Sat Jun  7 13:43:57 2008
@@ -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 */
   

Modified: trunk/vidix/vidixlib.c
==============================================================================
--- trunk/vidix/vidixlib.c	(original)
+++ trunk/vidix/vidixlib.c	Sat Jun  7 13:43:57 2008
@@ -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;

Modified: trunk/vidix/vidixlib.h
==============================================================================
--- trunk/vidix/vidixlib.h	(original)
+++ trunk/vidix/vidixlib.h	Sat Jun  7 13:43:57 2008
@@ -74,9 +74,6 @@ typedef struct VDXContext {
 
 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.