From 4b9905d1dcd193b41d914de5947e8ae77fbfcdff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= <mans@mansr.com>
Date: Sat, 6 Mar 2010 12:40:43 +0000
Subject: [PATCH] Move DECLARE_ALIGNED_{8,16} macros to mem.h
These macros naturally belong next to the generic DECLARE_ALIGNED
macro.
Originally committed as revision 22230 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
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 eb75a5224fd..44946e1a6dd 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 75beffb39af..36a2cf1fc40 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__))
--
GitLab