* Workaround for a bug in the GLIBC dlopen() code.

diff --git a/plugins/downmix/ac3_downmix_3dn.c b/plugins/downmix/ac3_downmix_3dn.c
index 83c335aa3c538c81e63dbf88f64bd0505b18f8fe..12b96ca3fa44d6eaa628090e2e44dda7d2bd96f8 100644 (file)
--- a/plugins/downmix/ac3_downmix_3dn.c
+++ b/plugins/downmix/ac3_downmix_3dn.c
@@ -2,7 +2,7 @@
  * ac3_downmix_3dn.c: accelerated 3D Now! ac3 downmix functions
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: ac3_downmix_3dn.c,v 1.6 2001/11/28 15:08:05 massiot Exp $
+ * $Id: ac3_downmix_3dn.c,v 1.6.2.1 2001/12/10 01:45:17 sam Exp $
  *
  * Authors: Renaud Dartus <reno@videolan.org>
  *
@@ -34,7 +34,8 @@
 
 #include "ac3_downmix.h"
 
-static const float sqrt2_3dn __asm__ ("sqrt2_3dn") = 0.7071068;
+/* Defining this one as static will cause dlopen() to segfault */
+const float sqrt2_3dn __asm__ ("sqrt2_3dn") = 0.7071068;
 
 void _M( downmix_3f_2r_to_2ch ) (float * samples, dm_par_t * dm_par)
 {

diff --git a/plugins/downmix/ac3_downmix_sse.c b/plugins/downmix/ac3_downmix_sse.c
index 2e2898b5d1b06aa97d7bfb70668196e649fa1dc4..41d8cc2b830b4355cd8a2794adce5c70c96275b9 100644 (file)
--- a/plugins/downmix/ac3_downmix_sse.c
+++ b/plugins/downmix/ac3_downmix_sse.c
@@ -2,7 +2,7 @@
  * ac3_downmix_sse.c: accelerated SSE ac3 downmix functions
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: ac3_downmix_sse.c,v 1.6 2001/11/28 15:08:05 massiot Exp $
+ * $Id: ac3_downmix_sse.c,v 1.6.2.1 2001/12/10 01:45:17 sam Exp $
  *
  * Authors: Renaud Dartus <reno@videolan.org>
  *          Aaron Holtzman <aholtzma@engr.uvic.ca>
@@ -35,7 +35,9 @@
 
 #include "ac3_downmix.h"
 
-static const float sqrt2_sse __asm__ ("sqrt2_sse") __attribute__ ((aligned (16))) = 0.7071068;
+/* Defining this one as static will cause dlopen() to segfault */
+const float sqrt2_sse __asm__ ("sqrt2_sse")
+                      __attribute__ ((aligned (16))) = 0.7071068;
 
 void _M( downmix_3f_2r_to_2ch ) (float * samples, dm_par_t * dm_par)
 {