[MPlayer-dev-eng] [PATCH] Make it compile with gcc 3.4
Bernhard Rosenkraenzer
bero at arklinux.org
Sun Feb 29 23:08:55 CET 2004
mplayer (current CVS) requires a couple of adjustments to work with gcc
3.4+.
Mostly making sure the new optimizer isn't too aggressive about removing
"unused" symbols, and a minor change (gcc 3.4+ doesn't accept a label at
the end of a function -- apparently ISO C doesn't like this feature of
earlier gccs).
LLaP
bero
--
Ark Linux - Linux for the masses
http://www.arklinux.org/
Redistribution and processing of this message is subject to
http://www.arklinux.org/terms.php
-------------- next part --------------
--- mplayer/libmpdemux/demux_viv.c.ark 2004-02-23 19:58:55.000000000 +0100
+++ mplayer/libmpdemux/demux_viv.c 2004-02-23 19:59:52.000000000 +0100
@@ -653,7 +653,7 @@
mp_msg(MSGT_DEMUX, MSGL_ERR, "VIVO: Not support audio codec (%d)\n",
priv->audio_codec);
free_sh_audio(sh);
- goto nosound;
+ return;
}
// Emulate WAVEFORMATEX struct:
@@ -713,7 +713,6 @@
demuxer->audio->sh=sh;
sh->ds=demuxer->audio;
demuxer->audio->id=1;
-nosound:
}
}
--- mplayer/libavcodec/i386/simple_idct_mmx.c.ark 2004-02-23 20:33:48.000000000 +0100
+++ mplayer/libavcodec/i386/simple_idct_mmx.c 2004-02-23 20:34:04.000000000 +0100
@@ -45,8 +45,8 @@
#define ROW_SHIFT 11
#define COL_SHIFT 20 // 6
-static const uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL;
-static const uint64_t __attribute__((aligned(8))) d40000= 0x0000000000040000ULL;
+static const uint64_t __attribute__((used, aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL;
+static const uint64_t __attribute__((used, aligned(8))) d40000= 0x0000000000040000ULL;
static const int16_t __attribute__((aligned(8))) coeffs[]= {
1<<(ROW_SHIFT-1), 0, 1<<(ROW_SHIFT-1), 0,
--- mplayer/libavcodec/i386/motion_est_mmx.c.ark 2004-02-23 20:36:49.000000000 +0100
+++ mplayer/libavcodec/i386/motion_est_mmx.c 2004-02-23 20:36:59.000000000 +0100
@@ -27,7 +27,7 @@
0x0002000200020002ULL,
};
-static __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL;
+static __attribute__ ((aligned(8), used)) uint64_t bone= 0x0101010101010101LL;
static inline void sad8_1_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h)
{
--- mplayer/libavcodec/i386/dsputil_mmx.c.ark 2004-02-23 20:37:37.000000000 +0100
+++ mplayer/libavcodec/i386/dsputil_mmx.c 2004-02-23 20:38:10.000000000 +0100
@@ -31,16 +31,16 @@
int mm_flags; /* multimedia extension flags */
/* pixel operations */
-static const uint64_t mm_bone __attribute__ ((aligned(8))) = 0x0101010101010101ULL;
-static const uint64_t mm_wone __attribute__ ((aligned(8))) = 0x0001000100010001ULL;
-static const uint64_t mm_wtwo __attribute__ ((aligned(8))) = 0x0002000200020002ULL;
-
-static const uint64_t ff_pw_20 __attribute__ ((aligned(8))) = 0x0014001400140014ULL;
-static const uint64_t ff_pw_3 __attribute__ ((aligned(8))) = 0x0003000300030003ULL;
-static const uint64_t ff_pw_16 __attribute__ ((aligned(8))) = 0x0010001000100010ULL;
-static const uint64_t ff_pw_15 __attribute__ ((aligned(8))) = 0x000F000F000F000FULL;
+static const uint64_t mm_bone __attribute__ ((aligned(8),used)) = 0x0101010101010101ULL;
+static const uint64_t mm_wone __attribute__ ((aligned(8),used)) = 0x0001000100010001ULL;
+static const uint64_t mm_wtwo __attribute__ ((aligned(8),used)) = 0x0002000200020002ULL;
+
+static const uint64_t ff_pw_20 __attribute__ ((aligned(8),used)) = 0x0014001400140014ULL;
+static const uint64_t ff_pw_3 __attribute__ ((aligned(8),used)) = 0x0003000300030003ULL;
+static const uint64_t ff_pw_16 __attribute__ ((aligned(8),used)) = 0x0010001000100010ULL;
+static const uint64_t ff_pw_15 __attribute__ ((aligned(8),used)) = 0x000F000F000F000FULL;
-static const uint64_t ff_pb_FC __attribute__ ((aligned(8))) = 0xFCFCFCFCFCFCFCFCULL;
+static const uint64_t ff_pb_FC __attribute__ ((aligned(8),used)) = 0xFCFCFCFCFCFCFCFCULL;
#define JUMPALIGN() __asm __volatile (".balign 8"::)
#define MOVQ_ZERO(regd) __asm __volatile ("pxor %%" #regd ", %%" #regd ::)
--- mplayer/libavcodec/libpostproc/postprocess.c.ark 2004-02-23 20:39:01.000000000 +0100
+++ mplayer/libavcodec/libpostproc/postprocess.c 2004-02-23 20:40:01.000000000 +0100
@@ -104,13 +104,13 @@
//#define NUM_BLOCKS_AT_ONCE 16 //not used yet
#ifdef ARCH_X86
-static uint64_t __attribute__((aligned(8))) w05= 0x0005000500050005LL;
-static uint64_t __attribute__((aligned(8))) w20= 0x0020002000200020LL;
-static uint64_t __attribute__((aligned(8))) b00= 0x0000000000000000LL;
-static uint64_t __attribute__((aligned(8))) b01= 0x0101010101010101LL;
-static uint64_t __attribute__((aligned(8))) b02= 0x0202020202020202LL;
-static uint64_t __attribute__((aligned(8))) b08= 0x0808080808080808LL;
-static uint64_t __attribute__((aligned(8))) b80= 0x8080808080808080LL;
+static uint64_t __attribute__((aligned(8),used)) w05= 0x0005000500050005LL;
+static uint64_t __attribute__((aligned(8),used)) w20= 0x0020002000200020LL;
+static uint64_t __attribute__((aligned(8),used)) b00= 0x0000000000000000LL;
+static uint64_t __attribute__((aligned(8),used)) b01= 0x0101010101010101LL;
+static uint64_t __attribute__((aligned(8),used)) b02= 0x0202020202020202LL;
+static uint64_t __attribute__((aligned(8),used)) b08= 0x0808080808080808LL;
+static uint64_t __attribute__((aligned(8),used)) b80= 0x8080808080808080LL;
#endif
@@ -119,7 +119,7 @@
static int verbose= 0;
-static const int deringThreshold= 20;
+static const int __attribute__((used)) deringThreshold= 20;
static struct PPFilter filters[]=
--- mplayer/liba52/resample_mmx.c.ark 2004-02-23 20:45:47.000000000 +0100
+++ mplayer/liba52/resample_mmx.c 2004-02-23 20:46:04.000000000 +0100
@@ -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__((aligned(8),used)) magicF2W= 0x43c0000043c00000LL;
+static uint64_t __attribute__((aligned(8),used)) wm1010= 0xFFFF0000FFFF0000LL;
+static uint64_t __attribute__((aligned(8),used)) wm0101= 0x0000FFFF0000FFFFLL;
+static uint64_t __attribute__((aligned(8),used)) wm1100= 0xFFFFFFFF00000000LL;
static int a52_resample_MONO_to_5_MMX(float * _f, int16_t * s16){
int32_t * f = (int32_t *) _f;
--- mplayer/liba52/imdct.c.ark 2004-02-23 20:46:19.000000000 +0100
+++ mplayer/liba52/imdct.c 2004-02-23 20:47:54.000000000 +0100
@@ -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__((aligned(16),used)) =
{
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,
@@ -100,20 +100,20 @@
#ifdef ARCH_X86
// NOTE: SSE needs 16byte alignment or it will segfault
//
-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__((aligned(16))) sseW0[4];
-static float __attribute__((aligned(16))) sseW1[8];
-static float __attribute__((aligned(16))) sseW2[16];
-static float __attribute__((aligned(16))) sseW3[32];
-static float __attribute__((aligned(16))) sseW4[64];
-static float __attribute__((aligned(16))) sseW5[128];
-static float __attribute__((aligned(16))) sseW6[256];
-static float __attribute__((aligned(16))) *sseW[7]=
+static complex_t __attribute__((aligned(16),used)) buf[128];
+static float __attribute__((aligned(16),used)) sseSinCos1c[256];
+static float __attribute__((aligned(16),used)) sseSinCos1d[256];
+static float __attribute__((aligned(16),used)) ps111_1[4]={1,1,1,-1};
+//static float __attribute__((aligned(16),used)) sseW0[4];
+static float __attribute__((aligned(16),used)) sseW1[8];
+static float __attribute__((aligned(16),used)) sseW2[16];
+static float __attribute__((aligned(16),used)) sseW3[32];
+static float __attribute__((aligned(16),used)) sseW4[64];
+static float __attribute__((aligned(16),used)) sseW5[128];
+static float __attribute__((aligned(16),used)) sseW6[256];
+static float __attribute__((aligned(16),used)) *sseW[7]=
{NULL /*sseW0*/,sseW1,sseW2,sseW3,sseW4,sseW5,sseW6};
-static float __attribute__((aligned(16))) sseWindow[512];
+static float __attribute__((aligned(16),used)) sseWindow[512];
#else
static complex_t __attribute__((aligned(16))) buf[128];
#endif
--- mplayer/libvo/osd.c.ark 2004-02-23 20:30:34.000000000 +0100
+++ mplayer/libvo/osd.c 2004-02-23 20:31:09.000000000 +0100
@@ -19,9 +19,9 @@
#endif
#ifdef CAN_COMPILE_X86_ASM
-static const uint64_t bFF __attribute__((aligned(8))) = 0xFFFFFFFFFFFFFFFFULL;
-static const unsigned long long mask24lh __attribute__((aligned(8))) = 0xFFFF000000000000ULL;
-static const unsigned long long mask24hl __attribute__((aligned(8))) = 0x0000FFFFFFFFFFFFULL;
+static const uint64_t bFF __attribute__((used)) __attribute__((aligned(8))) = 0xFFFFFFFFFFFFFFFFULL;
+static const unsigned long long mask24lh __attribute__((used)) __attribute__((aligned(8))) = 0xFFFF000000000000ULL;
+static const unsigned long long mask24hl __attribute__((used)) __attribute__((aligned(8))) = 0x0000FFFFFFFFFFFFULL;
#endif
//Note: we have C, X86-nommx, MMX, MMX2, 3DNOW version therse no 3DNOW+MMX2 one
--- mplayer/mp3lib/decode_i586.c.ark 2004-02-23 20:31:18.000000000 +0100
+++ mplayer/mp3lib/decode_i586.c 2004-02-23 20:31:31.000000000 +0100
@@ -27,7 +27,7 @@
#define real float /* ugly - but only way */
static long buffs[1088];
-static long bo=1;
+static long __attribute__((used)) bo=1;
static long saved_ebp;
int synth_1to1_pent(real *bandPtr, int channel, short *samples)
--- mplayer/mp3lib/decode_MMX.c.ark 2004-02-23 20:31:42.000000000 +0100
+++ mplayer/mp3lib/decode_MMX.c 2004-02-23 20:32:07.000000000 +0100
@@ -10,9 +10,9 @@
#include "../mangle.h"
#define real float /* ugly - but only way */
-static unsigned long long __attribute__((aligned(8))) null_one = 0x0000ffff0000ffffULL;
-static unsigned long long __attribute__((aligned(8))) one_null = 0xffff0000ffff0000ULL;
-unsigned long __attribute__((aligned(8))) costab_mmx[] =
+static unsigned long long __attribute__((used)) __attribute__((aligned(8))) null_one = 0x0000ffff0000ffffULL;
+static unsigned long long __attribute__((used)) __attribute__((aligned(8))) one_null = 0xffff0000ffff0000ULL;
+unsigned long __attribute__((used)) __attribute__((aligned(8))) costab_mmx[] =
{
1056974725,
1057056395,
--- mplayer/mp3lib/tabinit_MMX.c.ark 2004-02-23 20:32:15.000000000 +0100
+++ mplayer/mp3lib/tabinit_MMX.c 2004-02-23 20:32:36.000000000 +0100
@@ -11,7 +11,7 @@
extern real mp3lib_decwin[(512+32)];
// static long decwin [544];
-static short intwinbase_MMX[] =
+static short __attribute__((used)) intwinbase_MMX[] =
{
0, -1, -1, -1, -1, -1, -1, -2,
-2, -2, -2, -3, -3, -4, -4, -5,
@@ -48,7 +48,7 @@
15038
};
-static long intwindiv = 0x47800000;
+static long __attribute__((used)) intwindiv = 0x47800000;
void make_decode_tables_MMX(long scaleval)
{
--- mplayer/mp3lib/dct64_3dnow.c.ark 2004-02-23 20:32:46.000000000 +0100
+++ mplayer/mp3lib/dct64_3dnow.c 2004-02-23 20:32:58.000000000 +0100
@@ -12,7 +12,7 @@
#include "../mangle.h"
static unsigned long long int __attribute__((aligned(8))) x_plus_minus_3dnow = 0x8000000000000000ULL;
-static float plus_1f = 1.0;
+static float __attribute__((used)) plus_1f = 1.0;
void dct64_MMX_3dnow(real *a,real *b,real *c)
{
--- mplayer/mp3lib/dct64_k7.c.ark 2004-02-23 20:33:02.000000000 +0100
+++ mplayer/mp3lib/dct64_k7.c 2004-02-23 20:33:10.000000000 +0100
@@ -12,7 +12,7 @@
#include "../mangle.h"
static unsigned long long int __attribute__((aligned(8))) x_plus_minus_3dnow = 0x8000000000000000ULL;
-static float plus_1f = 1.0;
+static float __attribute__((used)) plus_1f = 1.0;
void dct64_MMX_3dnowex(real *a,real *b,real *c)
{
--- mplayer/postproc/rgb2rgb.c.ark 2004-02-23 20:40:25.000000000 +0100
+++ mplayer/postproc/rgb2rgb.c 2004-02-23 20:42:40.000000000 +0100
@@ -69,52 +69,52 @@
int srcStride3, int dstStride);
#ifdef ARCH_X86
-static const uint64_t mmx_null __attribute__((aligned(8))) = 0x0000000000000000ULL;
-static const uint64_t mmx_one __attribute__((aligned(8))) = 0xFFFFFFFFFFFFFFFFULL;
-static const uint64_t mask32b __attribute__((aligned(8))) = 0x000000FF000000FFULL;
-static const uint64_t mask32g __attribute__((aligned(8))) = 0x0000FF000000FF00ULL;
-static const uint64_t mask32r __attribute__((aligned(8))) = 0x00FF000000FF0000ULL;
-static const uint64_t mask32 __attribute__((aligned(8))) = 0x00FFFFFF00FFFFFFULL;
-static const uint64_t mask3216br __attribute__((aligned(8)))=0x00F800F800F800F8ULL;
-static const uint64_t mask3216g __attribute__((aligned(8)))=0x0000FC000000FC00ULL;
-static const uint64_t mask3215g __attribute__((aligned(8)))=0x0000F8000000F800ULL;
-static const uint64_t mul3216 __attribute__((aligned(8))) = 0x2000000420000004ULL;
-static const uint64_t mul3215 __attribute__((aligned(8))) = 0x2000000820000008ULL;
-static const uint64_t mask24b __attribute__((aligned(8))) = 0x00FF0000FF0000FFULL;
-static const uint64_t mask24g __attribute__((aligned(8))) = 0xFF0000FF0000FF00ULL;
-static const uint64_t mask24r __attribute__((aligned(8))) = 0x0000FF0000FF0000ULL;
-static const uint64_t mask24l __attribute__((aligned(8))) = 0x0000000000FFFFFFULL;
-static const uint64_t mask24h __attribute__((aligned(8))) = 0x0000FFFFFF000000ULL;
-static const uint64_t mask24hh __attribute__((aligned(8))) = 0xffff000000000000ULL;
-static const uint64_t mask24hhh __attribute__((aligned(8))) = 0xffffffff00000000ULL;
-static const uint64_t mask24hhhh __attribute__((aligned(8))) = 0xffffffffffff0000ULL;
-static const uint64_t mask15b __attribute__((aligned(8))) = 0x001F001F001F001FULL; /* 00000000 00011111 xxB */
-static const uint64_t mask15rg __attribute__((aligned(8))) = 0x7FE07FE07FE07FE0ULL; /* 01111111 11100000 RGx */
-static const uint64_t mask15s __attribute__((aligned(8))) = 0xFFE0FFE0FFE0FFE0ULL;
-static const uint64_t mask15g __attribute__((aligned(8))) = 0x03E003E003E003E0ULL;
-static const uint64_t mask15r __attribute__((aligned(8))) = 0x7C007C007C007C00ULL;
+static const uint64_t mmx_null __attribute__((aligned(8),used)) = 0x0000000000000000ULL;
+static const uint64_t mmx_one __attribute__((aligned(8),used)) = 0xFFFFFFFFFFFFFFFFULL;
+static const uint64_t mask32b __attribute__((aligned(8),used)) = 0x000000FF000000FFULL;
+static const uint64_t mask32g __attribute__((aligned(8),used)) = 0x0000FF000000FF00ULL;
+static const uint64_t mask32r __attribute__((aligned(8),used)) = 0x00FF000000FF0000ULL;
+static const uint64_t mask32 __attribute__((aligned(8),used)) = 0x00FFFFFF00FFFFFFULL;
+static const uint64_t mask3216br __attribute__((aligned(8),used))=0x00F800F800F800F8ULL;
+static const uint64_t mask3216g __attribute__((aligned(8),used))=0x0000FC000000FC00ULL;
+static const uint64_t mask3215g __attribute__((aligned(8),used))=0x0000F8000000F800ULL;
+static const uint64_t mul3216 __attribute__((aligned(8),used)) = 0x2000000420000004ULL;
+static const uint64_t mul3215 __attribute__((aligned(8),used)) = 0x2000000820000008ULL;
+static const uint64_t mask24b __attribute__((aligned(8),used)) = 0x00FF0000FF0000FFULL;
+static const uint64_t mask24g __attribute__((aligned(8),used)) = 0xFF0000FF0000FF00ULL;
+static const uint64_t mask24r __attribute__((aligned(8),used)) = 0x0000FF0000FF0000ULL;
+static const uint64_t mask24l __attribute__((aligned(8),used)) = 0x0000000000FFFFFFULL;
+static const uint64_t mask24h __attribute__((aligned(8),used)) = 0x0000FFFFFF000000ULL;
+static const uint64_t mask24hh __attribute__((aligned(8),used)) = 0xffff000000000000ULL;
+static const uint64_t mask24hhh __attribute__((aligned(8),used)) = 0xffffffff00000000ULL;
+static const uint64_t mask24hhhh __attribute__((aligned(8),used)) = 0xffffffffffff0000ULL;
+static const uint64_t mask15b __attribute__((aligned(8),used)) = 0x001F001F001F001FULL; /* 00000000 00011111 xxB */
+static const uint64_t mask15rg __attribute__((aligned(8),used)) = 0x7FE07FE07FE07FE0ULL; /* 01111111 11100000 RGx */
+static const uint64_t mask15s __attribute__((aligned(8),used)) = 0xFFE0FFE0FFE0FFE0ULL;
+static const uint64_t mask15g __attribute__((aligned(8),used)) = 0x03E003E003E003E0ULL;
+static const uint64_t mask15r __attribute__((aligned(8),used)) = 0x7C007C007C007C00ULL;
#define mask16b mask15b
-static const uint64_t mask16g __attribute__((aligned(8))) = 0x07E007E007E007E0ULL;
-static const uint64_t mask16r __attribute__((aligned(8))) = 0xF800F800F800F800ULL;
-static const uint64_t red_16mask __attribute__((aligned(8))) = 0x0000f8000000f800ULL;
-static const uint64_t green_16mask __attribute__((aligned(8)))= 0x000007e0000007e0ULL;
-static const uint64_t blue_16mask __attribute__((aligned(8))) = 0x0000001f0000001fULL;
-static const uint64_t red_15mask __attribute__((aligned(8))) = 0x00007c000000f800ULL;
-static const uint64_t green_15mask __attribute__((aligned(8)))= 0x000003e0000007e0ULL;
-static const uint64_t blue_15mask __attribute__((aligned(8))) = 0x0000001f0000001fULL;
+static const uint64_t mask16g __attribute__((aligned(8),used)) = 0x07E007E007E007E0ULL;
+static const uint64_t mask16r __attribute__((aligned(8),used)) = 0xF800F800F800F800ULL;
+static const uint64_t red_16mask __attribute__((aligned(8),used)) = 0x0000f8000000f800ULL;
+static const uint64_t green_16mask __attribute__((aligned(8),used))= 0x000007e0000007e0ULL;
+static const uint64_t blue_16mask __attribute__((aligned(8),used)) = 0x0000001f0000001fULL;
+static const uint64_t red_15mask __attribute__((aligned(8),used)) = 0x00007c000000f800ULL;
+static const uint64_t green_15mask __attribute__((aligned(8),used))= 0x000003e0000007e0ULL;
+static const uint64_t blue_15mask __attribute__((aligned(8),used)) = 0x0000001f0000001fULL;
#ifdef FAST_BGR2YV12
-static const uint64_t bgr2YCoeff __attribute__((aligned(8))) = 0x000000210041000DULL;
-static const uint64_t bgr2UCoeff __attribute__((aligned(8))) = 0x0000FFEEFFDC0038ULL;
-static const uint64_t bgr2VCoeff __attribute__((aligned(8))) = 0x00000038FFD2FFF8ULL;
+static const uint64_t bgr2YCoeff __attribute__((aligned(8),used)) = 0x000000210041000DULL;
+static const uint64_t bgr2UCoeff __attribute__((aligned(8),used)) = 0x0000FFEEFFDC0038ULL;
+static const uint64_t bgr2VCoeff __attribute__((aligned(8),used)) = 0x00000038FFD2FFF8ULL;
#else
-static const uint64_t bgr2YCoeff __attribute__((aligned(8))) = 0x000020E540830C8BULL;
-static const uint64_t bgr2UCoeff __attribute__((aligned(8))) = 0x0000ED0FDAC23831ULL;
-static const uint64_t bgr2VCoeff __attribute__((aligned(8))) = 0x00003831D0E6F6EAULL;
+static const uint64_t bgr2YCoeff __attribute__((aligned(8),used)) = 0x000020E540830C8BULL;
+static const uint64_t bgr2UCoeff __attribute__((aligned(8),used)) = 0x0000ED0FDAC23831ULL;
+static const uint64_t bgr2VCoeff __attribute__((aligned(8),used)) = 0x00003831D0E6F6EAULL;
#endif
-static const uint64_t bgr2YOffset __attribute__((aligned(8))) = 0x1010101010101010ULL;
-static const uint64_t bgr2UVOffset __attribute__((aligned(8)))= 0x8080808080808080ULL;
-static const uint64_t w1111 __attribute__((aligned(8))) = 0x0001000100010001ULL;
+static const uint64_t bgr2YOffset __attribute__((aligned(8),used)) = 0x1010101010101010ULL;
+static const uint64_t bgr2UVOffset __attribute__((aligned(8),used))= 0x8080808080808080ULL;
+static const uint64_t w1111 __attribute__((aligned(8),used)) = 0x0001000100010001ULL;
#if 0
static volatile uint64_t __attribute__((aligned(8))) b5Dither;
--- mplayer/postproc/swscale.c.ark 2004-02-23 20:44:09.000000000 +0100
+++ mplayer/postproc/swscale.c 2004-02-23 20:45:08.000000000 +0100
@@ -146,51 +146,51 @@
#define MAX(a,b) ((a) < (b) ? (b) : (a))
#ifdef ARCH_X86
-static uint64_t __attribute__((aligned(8))) bF8= 0xF8F8F8F8F8F8F8F8LL;
-static uint64_t __attribute__((aligned(8))) bFC= 0xFCFCFCFCFCFCFCFCLL;
-static uint64_t __attribute__((aligned(8))) w10= 0x0010001000100010LL;
-static uint64_t __attribute__((aligned(8))) w02= 0x0002000200020002LL;
-static uint64_t __attribute__((aligned(8))) bm00001111=0x00000000FFFFFFFFLL;
-static uint64_t __attribute__((aligned(8))) bm00000111=0x0000000000FFFFFFLL;
-static uint64_t __attribute__((aligned(8))) bm11111000=0xFFFFFFFFFF000000LL;
-static uint64_t __attribute__((aligned(8))) bm01010101=0x00FF00FF00FF00FFLL;
-
-static volatile uint64_t __attribute__((aligned(8))) b5Dither;
-static volatile uint64_t __attribute__((aligned(8))) g5Dither;
-static volatile uint64_t __attribute__((aligned(8))) g6Dither;
-static volatile uint64_t __attribute__((aligned(8))) r5Dither;
+static uint64_t __attribute__((aligned(8),used)) bF8= 0xF8F8F8F8F8F8F8F8LL;
+static uint64_t __attribute__((aligned(8),used)) bFC= 0xFCFCFCFCFCFCFCFCLL;
+static uint64_t __attribute__((aligned(8),used)) w10= 0x0010001000100010LL;
+static uint64_t __attribute__((aligned(8),used)) w02= 0x0002000200020002LL;
+static uint64_t __attribute__((aligned(8),used)) bm00001111=0x00000000FFFFFFFFLL;
+static uint64_t __attribute__((aligned(8),used)) bm00000111=0x0000000000FFFFFFLL;
+static uint64_t __attribute__((aligned(8),used)) bm11111000=0xFFFFFFFFFF000000LL;
+static uint64_t __attribute__((aligned(8),used)) bm01010101=0x00FF00FF00FF00FFLL;
+
+static volatile uint64_t __attribute__((aligned(8),used)) b5Dither;
+static volatile uint64_t __attribute__((aligned(8),used)) g5Dither;
+static volatile uint64_t __attribute__((aligned(8),used)) g6Dither;
+static volatile uint64_t __attribute__((aligned(8),used)) r5Dither;
-static uint64_t __attribute__((aligned(8))) dither4[2]={
+static uint64_t __attribute__((aligned(8),used)) dither4[2]={
0x0103010301030103LL,
0x0200020002000200LL,};
-static uint64_t __attribute__((aligned(8))) dither8[2]={
+static uint64_t __attribute__((aligned(8),used)) dither8[2]={
0x0602060206020602LL,
0x0004000400040004LL,};
-static uint64_t __attribute__((aligned(8))) b16Mask= 0x001F001F001F001FLL;
-static uint64_t __attribute__((aligned(8))) g16Mask= 0x07E007E007E007E0LL;
-static uint64_t __attribute__((aligned(8))) r16Mask= 0xF800F800F800F800LL;
-static uint64_t __attribute__((aligned(8))) b15Mask= 0x001F001F001F001FLL;
-static uint64_t __attribute__((aligned(8))) g15Mask= 0x03E003E003E003E0LL;
-static uint64_t __attribute__((aligned(8))) r15Mask= 0x7C007C007C007C00LL;
-
-static uint64_t __attribute__((aligned(8))) M24A= 0x00FF0000FF0000FFLL;
-static uint64_t __attribute__((aligned(8))) M24B= 0xFF0000FF0000FF00LL;
-static uint64_t __attribute__((aligned(8))) M24C= 0x0000FF0000FF0000LL;
+static uint64_t __attribute__((aligned(8),used)) b16Mask= 0x001F001F001F001FLL;
+static uint64_t __attribute__((aligned(8),used)) g16Mask= 0x07E007E007E007E0LL;
+static uint64_t __attribute__((aligned(8),used)) r16Mask= 0xF800F800F800F800LL;
+static uint64_t __attribute__((aligned(8),used)) b15Mask= 0x001F001F001F001FLL;
+static uint64_t __attribute__((aligned(8),used)) g15Mask= 0x03E003E003E003E0LL;
+static uint64_t __attribute__((aligned(8),used)) r15Mask= 0x7C007C007C007C00LL;
+
+static uint64_t __attribute__((aligned(8),used)) M24A= 0x00FF0000FF0000FFLL;
+static uint64_t __attribute__((aligned(8),used)) M24B= 0xFF0000FF0000FF00LL;
+static uint64_t __attribute__((aligned(8),used)) M24C= 0x0000FF0000FF0000LL;
#ifdef FAST_BGR2YV12
-static const uint64_t bgr2YCoeff __attribute__((aligned(8))) = 0x000000210041000DULL;
-static const uint64_t bgr2UCoeff __attribute__((aligned(8))) = 0x0000FFEEFFDC0038ULL;
-static const uint64_t bgr2VCoeff __attribute__((aligned(8))) = 0x00000038FFD2FFF8ULL;
+static const uint64_t bgr2YCoeff __attribute__((aligned(8),used)) = 0x000000210041000DULL;
+static const uint64_t bgr2UCoeff __attribute__((aligned(8),used)) = 0x0000FFEEFFDC0038ULL;
+static const uint64_t bgr2VCoeff __attribute__((aligned(8),used)) = 0x00000038FFD2FFF8ULL;
#else
-static const uint64_t bgr2YCoeff __attribute__((aligned(8))) = 0x000020E540830C8BULL;
-static const uint64_t bgr2UCoeff __attribute__((aligned(8))) = 0x0000ED0FDAC23831ULL;
-static const uint64_t bgr2VCoeff __attribute__((aligned(8))) = 0x00003831D0E6F6EAULL;
+static const uint64_t bgr2YCoeff __attribute__((aligned(8),used)) = 0x000020E540830C8BULL;
+static const uint64_t bgr2UCoeff __attribute__((aligned(8),used)) = 0x0000ED0FDAC23831ULL;
+static const uint64_t bgr2VCoeff __attribute__((aligned(8),used)) = 0x00003831D0E6F6EAULL;
#endif
-static const uint64_t bgr2YOffset __attribute__((aligned(8))) = 0x1010101010101010ULL;
-static const uint64_t bgr2UVOffset __attribute__((aligned(8)))= 0x8080808080808080ULL;
-static const uint64_t w1111 __attribute__((aligned(8))) = 0x0001000100010001ULL;
+static const uint64_t bgr2YOffset __attribute__((aligned(8),used)) = 0x1010101010101010ULL;
+static const uint64_t bgr2UVOffset __attribute__((aligned(8),used))= 0x8080808080808080ULL;
+static const uint64_t w1111 __attribute__((aligned(8),used)) = 0x0001000100010001ULL;
#endif
// clipping helper table for C implementations:
More information about the MPlayer-dev-eng
mailing list