diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 4b697ef9fa47d9d6b139e801de6dd1d37e4209ac..f95077f0f473ce17249703f19c8bdf6184ba6f47 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 19c8a99ff571c66ae0ccc12553bdf02b7b87b7e3..86e154621b056000db921d2700bbf20b3f5d490d 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]) {