From e95930eda18e90eaea30fd397ea21b30f7763137 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Tue, 20 Aug 2013 14:24:04 +0200
Subject: [PATCH] avcodec/utils: Simplify a condition that combines HAVE_NEON
 and ARCH_ARM

---
 libavcodec/utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 13419c7936..bf79cf1d08 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -160,7 +160,7 @@ void avcodec_set_dimensions(AVCodecContext *s, int width, int height)
     s->height       = height;
 }
 
-#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