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

[diego]

Author: diego
Date: Wed Feb 17 20:21:28 2010
New Revision: 30606

Log:
Revert marking seemingly unused RealAudio/RealVideo-related functions as static.

The functions are required to load binary Real codecs, so they need to be kept.
Group all functions together in ad_realaud.c because all the functions are used
to load audio binaries and only some to load video binaries.

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

Modified: trunk/libmpcodecs/ad_realaud.c
==============================================================================
--- trunk/libmpcodecs/ad_realaud.c	Wed Feb 17 08:06:12 2010	(r30605)
+++ trunk/libmpcodecs/ad_realaud.c	Wed Feb 17 20:21:28 2010	(r30606)
@@ -41,18 +41,46 @@ static const ad_info_t info =  {
 
 LIBAD_EXTERN(realaud)
 
-static void *__builtin_new(unsigned long size)
+/* These functions are required for loading Real binary libs.
+ * Add forward declarations to avoid warnings with -Wmissing-prototypes. */
+void *__builtin_new(unsigned long size);
+void  __builtin_delete(void *ize);
+void *__builtin_vec_new(unsigned long size);
+void  __builtin_vec_delete(void *mem);
+void  __pure_virtual(void);
+
+void *__builtin_new(unsigned long size)
 {
 	return malloc(size);
 }
 
-// required for cook's uninit:
-static void __builtin_delete(void* ize)
+void __builtin_delete(void* ize)
 {
 	free(ize);
 }
 
+void *__builtin_vec_new(unsigned long size)
+{
+	return malloc(size);
+}
+
+void __builtin_vec_delete(void *mem)
+{
+	free(mem);
+}
+
+void __pure_virtual(void)
+{
+	printf("FATAL: __pure_virtual() called!\n");
+//	exit(1);
+}
+
 #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+void ___brk_addr(void);
+void ___brk_addr(void) {exit(0);}
+char **__environ={NULL};
+#undef stderr
+FILE *stderr=NULL;
 void *__ctype_b=NULL;
 #endif
 

Modified: trunk/libmpcodecs/vd_realvid.c
==============================================================================
--- trunk/libmpcodecs/vd_realvid.c	Wed Feb 17 08:06:12 2010	(r30605)
+++ trunk/libmpcodecs/vd_realvid.c	Wed Feb 17 20:21:28 2010	(r30606)
@@ -84,29 +84,6 @@ static int bufsz = 0;
 static int dll_type = 0; /* 0 = unix dlopen, 1 = win32 dll */
 #endif
 
-static void *__builtin_vec_new(unsigned long size)
-{
-	return malloc(size);
-}
-
-static void __builtin_vec_delete(void *mem)
-{
-	free(mem);
-}
-
-static void __pure_virtual(void)
-{
-	printf("FATAL: __pure_virtual() called!\n");
-//	exit(1);
-}
-
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-void ___brk_addr(void) {exit(0);}
-char **__environ={NULL};
-#undef stderr
-FILE *stderr=NULL;
-#endif
-
 // to set/get/query special features/parameters
 static int control(sh_video_t *sh,int cmd,void* arg,...){
 //    switch(cmd){