[MPlayer-cvslog] r21482 - in trunk/libmpcodecs: ad_realaud.c vd_realvid.c

[reimar]

Author: reimar
Date: Sun Dec  3 22:43:57 2006
New Revision: 21482

Modified:
   trunk/libmpcodecs/ad_realaud.c
   trunk/libmpcodecs/vd_realvid.c

Log:
Remove unused function pointers, they probably had incorrect prototypes
anyway.


Modified: trunk/libmpcodecs/ad_realaud.c
==============================================================================
--- trunk/libmpcodecs/ad_realaud.c	(original)
+++ trunk/libmpcodecs/ad_realaud.c	Sun Dec  3 22:43:57 2006
@@ -39,9 +39,7 @@
 
 static unsigned long (*raCloseCodec)(void*);
 static unsigned long (*raDecode)(void*, char*,unsigned long,char*,unsigned int*,long);
-static unsigned long (*raFlush)(unsigned long,unsigned long,unsigned long);
 static unsigned long (*raFreeDecoder)(void*);
-static void*         (*raGetFlavorProperty)(void*,unsigned long,unsigned long,int*);
 //static unsigned long (*raGetNumberOfFlavors2)(void);
 static unsigned long (*raInitDecoder)(void*, void*);
 static unsigned long (*raOpenCodec)(void*);
@@ -52,9 +50,7 @@
 #ifdef USE_WIN32DLL
 static unsigned long WINAPI (*wraCloseCodec)(void*);
 static unsigned long WINAPI (*wraDecode)(void*, char*,unsigned long,char*,unsigned int*,long);
-static unsigned long WINAPI (*wraFlush)(unsigned long,unsigned long,unsigned long);
 static unsigned long WINAPI (*wraFreeDecoder)(void*);
-static void*         WINAPI (*wraGetFlavorProperty)(void*,unsigned long,unsigned long,int*);
 static unsigned long WINAPI (*wraInitDecoder)(void*, void*);
 static unsigned long WINAPI (*wraOpenCodec)(void*);
 static unsigned long WINAPI (*wraOpenCodec2)(void*, void*);
@@ -129,9 +125,7 @@
 
     raCloseCodec = dlsym(handle, "RACloseCodec");
     raDecode = dlsym(handle, "RADecode");
-    raFlush = dlsym(handle, "RAFlush");
     raFreeDecoder = dlsym(handle, "RAFreeDecoder");
-    raGetFlavorProperty = dlsym(handle, "RAGetFlavorProperty");
     raOpenCodec = dlsym(handle, "RAOpenCodec");
     raOpenCodec2 = dlsym(handle, "RAOpenCodec2");
     raInitDecoder = dlsym(handle, "RAInitDecoder");
@@ -139,8 +133,8 @@
     raSetDLLAccessPath = dlsym(handle, "SetDLLAccessPath");
     raSetPwd = dlsym(handle, "RASetPwd"); // optional, used by SIPR
     
-    if (raCloseCodec && raDecode && /*raFlush && */raFreeDecoder &&
-	raGetFlavorProperty && (raOpenCodec||raOpenCodec2) && raSetFlavor &&
+    if (raCloseCodec && raDecode && raFreeDecoder &&
+	(raOpenCodec||raOpenCodec2) && raSetFlavor &&
 	/*raSetDLLAccessPath &&*/ raInitDecoder)
     {
 	rv_handle = handle;
@@ -179,9 +173,7 @@
 
     wraCloseCodec = GetProcAddress(handle, "RACloseCodec");
     wraDecode = GetProcAddress(handle, "RADecode");
-    wraFlush = GetProcAddress(handle, "RAFlush");
     wraFreeDecoder = GetProcAddress(handle, "RAFreeDecoder");
-    wraGetFlavorProperty = GetProcAddress(handle, "RAGetFlavorProperty");
     wraOpenCodec = GetProcAddress(handle, "RAOpenCodec");
     wraOpenCodec2 = GetProcAddress(handle, "RAOpenCodec2");
     wraInitDecoder = GetProcAddress(handle, "RAInitDecoder");
@@ -189,8 +181,8 @@
     wraSetDLLAccessPath = GetProcAddress(handle, "SetDLLAccessPath");
     wraSetPwd = GetProcAddress(handle, "RASetPwd"); // optional, used by SIPR
     
-    if (wraCloseCodec && wraDecode && /*wraFlush && */wraFreeDecoder &&
-	wraGetFlavorProperty && (wraOpenCodec || wraOpenCodec2) && wraSetFlavor &&
+    if (wraCloseCodec && wraDecode && wraFreeDecoder &&
+	(wraOpenCodec || wraOpenCodec2) && wraSetFlavor &&
 	/*wraSetDLLAccessPath &&*/ wraInitDecoder)
     {
 	rv_handle = handle;

Modified: trunk/libmpcodecs/vd_realvid.c
==============================================================================
--- trunk/libmpcodecs/vd_realvid.c	(original)
+++ trunk/libmpcodecs/vd_realvid.c	Sun Dec  3 22:43:57 2006
@@ -48,13 +48,11 @@
 
 static unsigned long (*rvyuv_custom_message)(cmsg_data_t* ,void*);
 static unsigned long (*rvyuv_free)(void*);
-static unsigned long (*rvyuv_hive_message)(unsigned long,unsigned long);
 static unsigned long (*rvyuv_init)(void*, void*); // initdata,context
 static unsigned long (*rvyuv_transform)(char*, char*,transform_in_t*,unsigned int*,void*);
 #ifdef USE_WIN32DLL
 static unsigned long WINAPI (*wrvyuv_custom_message)(cmsg_data_t* ,void*);
 static unsigned long WINAPI (*wrvyuv_free)(void*);
-static unsigned long WINAPI (*wrvyuv_hive_message)(unsigned long,unsigned long);
 static unsigned long WINAPI (*wrvyuv_init)(void*, void*); // initdata,context
 static unsigned long WINAPI (*wrvyuv_transform)(char*, char*,transform_in_t*,unsigned int*,void*);
 #endif
@@ -111,13 +109,11 @@
 
 		rvyuv_custom_message = dlsym(handle, "RV20toYUV420CustomMessage");
 		rvyuv_free = dlsym(handle, "RV20toYUV420Free");
-		rvyuv_hive_message = dlsym(handle, "RV20toYUV420HiveMessage");
 		rvyuv_init = dlsym(handle, "RV20toYUV420Init");
 		rvyuv_transform = dlsym(handle, "RV20toYUV420Transform");
 
     if(rvyuv_custom_message &&
        rvyuv_free &&
-       rvyuv_hive_message &&
        rvyuv_init &&
        rvyuv_transform)
     {
@@ -127,13 +123,11 @@
 	
 		rvyuv_custom_message = dlsym(handle, "RV40toYUV420CustomMessage");
 		rvyuv_free = dlsym(handle, "RV40toYUV420Free");
-		rvyuv_hive_message = dlsym(handle, "RV40toYUV420HiveMessage");
 		rvyuv_init = dlsym(handle, "RV40toYUV420Init");
 		rvyuv_transform = dlsym(handle, "RV40toYUV420Transform");
 
     if(rvyuv_custom_message &&
        rvyuv_free &&
-       rvyuv_hive_message &&
        rvyuv_init &&
        rvyuv_transform)
     {
@@ -172,13 +166,11 @@
 
     wrvyuv_custom_message = GetProcAddress(handle, "RV20toYUV420CustomMessage");
     wrvyuv_free = GetProcAddress(handle, "RV20toYUV420Free");
-    wrvyuv_hive_message = GetProcAddress(handle, "RV20toYUV420HiveMessage");
     wrvyuv_init = GetProcAddress(handle, "RV20toYUV420Init");
     wrvyuv_transform = GetProcAddress(handle, "RV20toYUV420Transform");
 
     if(wrvyuv_custom_message &&
        wrvyuv_free &&
-       wrvyuv_hive_message &&
        wrvyuv_init &&
        wrvyuv_transform)
     {