Merge remote-tracking branch 'qatar/master'

* qatar/master: avcodec/utils: Simplify a condition that combines HAVE_NEON and ARCH_ARM Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · 3d842cf827
parent 70a73213b7 e95930eda1
commit 3d842cf827
1 changed files with 1 additions and 1 deletions
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@ -184,7 +184,7 @@ void avcodec_set_dimensions(AVCodecContext *s, int width, int height)
    s->height       = FF_CEIL_RSHIFT(height, s->lowres);
 }

-#if (ARCH_ARM && HAVE_NEON) || ARCH_PPC || HAVE_MMX
+#if HAVE_NEON || ARCH_PPC || HAVE_MMX
 #   define STRIDE_ALIGN 16
 #else
 #   define STRIDE_ALIGN 8