aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-17 19:21:28 +0000
committerGravatar diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-17 19:21:28 +0000
commitf15694a779d8d1ae2b42cb9643e73ed34fa58f32 (patch)
tree74741f6173763a21b3a644c2f03342de45eda345
parentcdd0ab0da9818aeb527e35fe73ee57bdf3aa4f70 (diff)
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. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30606 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libmpcodecs/ad_realaud.c34
-rw-r--r--libmpcodecs/vd_realvid.c23
2 files changed, 31 insertions, 26 deletions
diff --git a/libmpcodecs/ad_realaud.c b/libmpcodecs/ad_realaud.c
index c0fe074232..00f995cd3a 100644
--- a/libmpcodecs/ad_realaud.c
+++ b/libmpcodecs/ad_realaud.c
@@ -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
diff --git a/libmpcodecs/vd_realvid.c b/libmpcodecs/vd_realvid.c
index 3bbb44e636..6d71a49e20 100644
--- a/libmpcodecs/vd_realvid.c
+++ b/libmpcodecs/vd_realvid.c
@@ -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){