# HG changeset patch # User mru # Date 1203189510 0 # Node ID 7ebd1cdb2142291d914e771a0ff41f20b03f1de1 # Parent 78aa57eba353f6957db8ba375ff148c72c913aa1 clean up definition of DECLARE_ALIGNED_8 and STRIDE_ALIGN diff -r 78aa57eba353 -r 7ebd1cdb2142 dsputil.h --- a/dsputil.h Sat Feb 16 15:17:31 2008 +0000 +++ b/dsputil.h Sat Feb 16 19:18:30 2008 +0000 @@ -527,40 +527,14 @@ emms();\ } -#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) - -#define STRIDE_ALIGN 8 - void dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx); #elif defined(ARCH_ARMV4L) -/* This is to use 4 bytes read to the IDCT pointers for some 'zero' - line optimizations */ -#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(4, t, v) -#define STRIDE_ALIGN 4 - #define MM_IWMMXT 0x0100 /* XScale IWMMXT */ extern int mm_flags; -#elif defined(HAVE_MLIB) - -/* SPARC/VIS IDCT needs 8-byte aligned DCT blocks */ -#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) -#define STRIDE_ALIGN 8 - -#elif defined(HAVE_VIS) - -/* SPARC/VIS IDCT needs 8-byte aligned DCT blocks */ -#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) -#define STRIDE_ALIGN 8 - -#elif defined(ARCH_ALPHA) - -#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) -#define STRIDE_ALIGN 8 - #elif defined(ARCH_POWERPC) #define MM_ALTIVEC 0x0001 /* standard AltiVec */ @@ -575,21 +549,14 @@ #define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(16, t, v) #define STRIDE_ALIGN 16 -#elif defined(ARCH_SH4) - -#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) -#define STRIDE_ALIGN 8 - -#elif defined(ARCH_BFIN) +#endif -#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) -#define STRIDE_ALIGN 8 +#ifndef DECLARE_ALIGNED_8 +# define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) +#endif -#else - -#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) -#define STRIDE_ALIGN 8 - +#ifndef STRIDE_ALIGN +# define STRIDE_ALIGN 8 #endif /* PSNR */