[FFmpeg-devel] [PATCH] Move DECLARE_ALIGNED_{8, 16} macros to mem.h

Mans Rullgard mans
Sat Mar 6 03:50:30 CET 2010


These macros naturally belong next to the generic DECLARE_ALIGNED
macro.
---
 libavcodec/dsputil.h |    3 ---
 libavutil/mem.h      |    2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index eb75a52..44946e1 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -663,9 +663,6 @@ void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx);
 void dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx);
 void dsputil_init_vis(DSPContext* c, AVCodecContext *avctx);
 
-#define DECLARE_ALIGNED_16(t, v, ...) DECLARE_ALIGNED(16, t, v)
-#define DECLARE_ALIGNED_8(t, v, ...)  DECLARE_ALIGNED(8, t, v)
-
 #if HAVE_MMX
 
 #undef emms_c
diff --git a/libavutil/mem.h b/libavutil/mem.h
index 75beffb..36a2cf1 100644
--- a/libavutil/mem.h
+++ b/libavutil/mem.h
@@ -49,6 +49,8 @@
     #define DECLARE_ASM_CONST(n,t,v)    static const t v
 #endif
 
+#define DECLARE_ALIGNED_16(t, v) DECLARE_ALIGNED(16, t, v)
+#define DECLARE_ALIGNED_8(t, v)  DECLARE_ALIGNED(8, t, v)
 
 #if AV_GCC_VERSION_AT_LEAST(3,1)
     #define av_malloc_attrib __attribute__((__malloc__))
-- 
1.7.0




More information about the ffmpeg-devel mailing list