Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Aug 2013 11:08:49 +0000 (13:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Aug 2013 11:08:55 +0000 (13:08 +0200)
* qatar/master:
  avcodec/utils: Simplify a condition that combines HAVE_NEON and ARCH_ARM

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
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