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>

diff --cc libavcodec/utils.c
index 3ae4af6a9e021a8333c23835278fe451f4254665,bf79cf1d080a0fedbaff64524dcf95f1fe573485..0be93402530d7cf7c5cb95b4787a803b85841b23
--- 1/libavcodec/utils.c
--- 2/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@@ -180,11 -156,11 +180,11 @@@ void avcodec_set_dimensions(AVCodecCont
  {
      s->coded_width  = width;
      s->coded_height = height;
 -    s->width        = width;
 -    s->height       = height;
 +    s->width        = FF_CEIL_RSHIFT(width,  s->lowres);
 +    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