From f56fcffcfdef4f5ab60a6a004b59287264ec9cfa Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 3 Dec 2006 21:43:57 +0000 Subject: Remove unused function pointers, they probably had incorrect prototypes anyway. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21482 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/ad_realaud.c | 16 ++++------------ libmpcodecs/vd_realvid.c | 8 -------- 2 files changed, 4 insertions(+), 20 deletions(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/ad_realaud.c b/libmpcodecs/ad_realaud.c index 866bcd7d37..bf6d6ab71e 100644 --- a/libmpcodecs/ad_realaud.c +++ b/libmpcodecs/ad_realaud.c @@ -39,9 +39,7 @@ void *__ctype_b=NULL; 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 @@ static void (*raSetPwd)(char*,char*); #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 @@ static int load_syms_linux(char *path) 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 @@ static int load_syms_linux(char *path) 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 @@ static int load_syms_windows(char *path) 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 @@ static int load_syms_windows(char *path) 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; diff --git a/libmpcodecs/vd_realvid.c b/libmpcodecs/vd_realvid.c index 2ef9733c8f..5861e93029 100644 --- a/libmpcodecs/vd_realvid.c +++ b/libmpcodecs/vd_realvid.c @@ -48,13 +48,11 @@ typedef struct transform_in_s { 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 @@ static int load_syms_linux(char *path) { 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 @@ static int load_syms_linux(char *path) { 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 @@ static int load_syms_windows(char *path) { 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) { -- cgit v1.2.3