From c6507946d428ee082676d5917fbb3eb0d1d7eb2e Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Fri, 8 Feb 2013 15:55:52 +0100
Subject: [PATCH] dsputil: Move STRIDE_ALIGN macro to the only place it is used
---
libavcodec/dsputil.h | 6 ------
libavcodec/utils.c | 7 +++++++
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index 4b697ef9fa4..f95077f0f47 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -397,10 +397,4 @@ void ff_dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx);
void ff_dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx);
void ff_dsputil_init_vis(DSPContext* c, AVCodecContext *avctx);
-#if (ARCH_ARM && HAVE_NEON) || ARCH_PPC || HAVE_MMX
-# define STRIDE_ALIGN 16
-#else
-# define STRIDE_ALIGN 8
-#endif
-
#endif /* AVCODEC_DSPUTIL_H */
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 19c8a99ff57..86e154621b0 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -25,6 +25,7 @@
* utils.
*/
+#include "config.h"
#include "libavutil/avassert.h"
#include "libavutil/avstring.h"
#include "libavutil/channel_layout.h"
@@ -156,6 +157,12 @@ void avcodec_set_dimensions(AVCodecContext *s, int width, int height)
#define INTERNAL_BUFFER_SIZE (32 + 1)
+#if (ARCH_ARM && HAVE_NEON) || ARCH_PPC || HAVE_MMX
+# define STRIDE_ALIGN 16
+#else
+# define STRIDE_ALIGN 8
+#endif
+
void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
int linesize_align[AV_NUM_DATA_POINTERS])
{
--
GitLab