From 90d6b563fe815b7be7fb9ce675927b64d0ba3f34 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 15 Mar 2014 14:47:04 +0100 Subject: [PATCH] avcodec: Move STRIDE_ALIGN to internal.h The next commit/bugfix will need it Signed-off-by: Michael Niedermayer (cherry picked from commit da89572004f6c0279134d4c8c1c835496a2c4232) --- libavcodec/internal.h | 6 ++++++ libavcodec/utils.c | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 8aa0ac101c..d300dcdd6d 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -35,6 +35,12 @@ #define FF_SANE_NB_CHANNELS 63U +#if HAVE_NEON || ARCH_PPC || HAVE_MMX +# define STRIDE_ALIGN 16 +#else +# define STRIDE_ALIGN 8 +#endif + typedef struct FramePool { /** * Pools for each data plane. For audio all the planes have the same size, diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 40567f51d3..11b874f764 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -274,12 +274,6 @@ int ff_side_data_update_matrix_encoding(AVFrame *frame, return 0; } -#if 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]) {