[MPlayer-dev-eng] [PATCH] [UPDATED] mp3lib and liba52 gcc 3.4 fixes

VMiklos mamajom at axelero.hu
Mon Apr 26 21:47:05 CEST 2004


On Mon, 26 Apr 2004, matthieu castet wrote:

> >> here is a full patch updated to current cvs
> >> it contains the current liba52 and postproc parts
> > mine for postproc.
> > You seem to have forgotten yuv2rgb.c, even if it compil well without any
> > modification.
> patch attach ...

yes, your postproc patch is better. so here is my two liba52 pathes and
my mp3lib patch

udv / greetings

---
       __________     VMiklos / FrugalWare & EL Team
  ____/__/___|___\__. E-mail: mamajom at axelero dot hu
O__O  _ |   |   _  |  Homepage: http://www.vmiklos.tk
'--`-(_)'---'--(_)-'  gpg --keyserver pgp.mit.edu --recv-keys 03915096

-------------- next part --------------
diff -Naur main.orig/liba52/resample_mmx.c main/liba52/resample_mmx.c
--- main.orig/liba52/resample_mmx.c	2002-11-07 00:54:22.000000000 +0100
+++ main/liba52/resample_mmx.c	2004-04-26 19:48:39.000000000 +0200
@@ -7,10 +7,10 @@
 	and it would mean (C / MMX2 / MMX / 3DNOW) versions 
 */
 
-static uint64_t __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL;
-static uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000LL;
-static uint64_t __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL;
-static uint64_t __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL;
+static uint64_t attribute_used __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL;
+static uint64_t attribute_used __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000LL;
+static uint64_t attribute_used __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL;
+static uint64_t attribute_used __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL;
 
 static int a52_resample_MONO_to_5_MMX(float * _f, int16_t * s16){
     int32_t * f = (int32_t *) _f;
-------------- next part --------------
diff -Naur main.orig/liba52/imdct.c main/liba52/imdct.c
--- main.orig/liba52/imdct.c	2003-01-27 22:47:24.000000000 +0100
+++ main/liba52/imdct.c	2004-04-26 19:44:09.000000000 +0200
@@ -56,7 +56,7 @@
 
 static void fft_128p(complex_t *a);
 
-static const int pm128[128] __attribute__((aligned(16))) =
+static const int pm128[128] attribute_used __attribute__((aligned(16))) =
 {
 	0, 16, 32, 48, 64, 80,  96, 112,  8, 40, 72, 104, 24, 56,  88, 120,
 	4, 20, 36, 52, 68, 84, 100, 116, 12, 28, 44,  60, 76, 92, 108, 124,
@@ -69,7 +69,7 @@
 }; 
 
 /* 128 point bit-reverse LUT */
-static uint8_t bit_reverse_512[] = {
+static uint8_t attribute_used bit_reverse_512[] = {
 	0x00, 0x40, 0x20, 0x60, 0x10, 0x50, 0x30, 0x70, 
 	0x08, 0x48, 0x28, 0x68, 0x18, 0x58, 0x38, 0x78, 
 	0x04, 0x44, 0x24, 0x64, 0x14, 0x54, 0x34, 0x74, 
@@ -103,7 +103,7 @@
 static complex_t __attribute__((aligned(16))) buf[128];
 static float __attribute__((aligned(16))) sseSinCos1c[256];
 static float __attribute__((aligned(16))) sseSinCos1d[256];
-static float __attribute__((aligned(16))) ps111_1[4]={1,1,1,-1};
+static float attribute_used __attribute__((aligned(16))) ps111_1[4]={1,1,1,-1};
 //static float __attribute__((aligned(16))) sseW0[4];
 static float __attribute__((aligned(16))) sseW1[8];
 static float __attribute__((aligned(16))) sseW2[16];
-------------- next part --------------
diff -Naur main.orig/mp3lib/tabinit_MMX.c main/mp3lib/tabinit_MMX.c
--- main.orig/mp3lib/tabinit_MMX.c	2004-04-26 12:09:31.000000000 +0200
+++ main/mp3lib/tabinit_MMX.c	2004-04-26 19:48:39.000000000 +0200
@@ -49,7 +49,7 @@
 	  15038
 };
 
-static long intwindiv = 0x47800000;
+static long attribute_used intwindiv = 0x47800000;
 
 void make_decode_tables_MMX(long scaleval)
 {


More information about the MPlayer-dev-eng mailing list