diff options
| author | Måns Rullgård <mans@mansr.com> | 2008-02-16 19:18:30 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2008-02-16 19:18:30 +0000 |
| commit | 5c319d33348c59761fb80d524e58f50d8aaf4fb7 (patch) | |
| tree | 04279615bbeb91d9ca94c3868d4fe74d66acd666 /libavcodec/dsputil.h | |
| parent | d2a4ecafbba2a1a5895c6c3e2e6781f9751a681d (diff) | |
clean up definition of DECLARE_ALIGNED_8 and STRIDE_ALIGN
Originally committed as revision 12126 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 45 |
1 files changed, 6 insertions, 39 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index ec0b500d0a..2b9f7b48fd 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -527,40 +527,14 @@ static inline void emms(void) 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 @@ extern int mm_flags; #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) - -#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(8, t, v) -#define STRIDE_ALIGN 8 - -#else +#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 +#ifndef STRIDE_ALIGN +# define STRIDE_ALIGN 8 #endif /* PSNR */ |