Merge commit '76b19a3984359b3be44d4f7e4e69b7b86729a622'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Feb 2013 11:56:46 +0000 (12:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Feb 2013 11:56:55 +0000 (12:56 +0100)
* commit '76b19a3984359b3be44d4f7e4e69b7b86729a622':
  Fix a number of incorrect intmath.h #includes.
  avconv: remove an unused variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/arm/dca.h
libavcodec/dcadec.c
libavcodec/fft-internal.h
libavcodec/ra144dec.c
libavcodec/ratecontrol.c

  #define AVCODEC_ARM_DCA_H
  
  #include <stdint.h>
  #include "config.h"
- #include "libavutil/intmath.h"
+ #include "libavcodec/mathops.h"
  
 -#if HAVE_ARMV6_INLINE && AV_GCC_VERSION_AT_LEAST(4,4)
 +#if HAVE_ARMV6_INLINE && AV_GCC_VERSION_AT_LEAST(4,4) && !CONFIG_THUMB
  
  #define decode_blockcodes decode_blockcodes
  static inline int decode_blockcodes(int code1, int code2, int levels,
Simple merge
Simple merge
Simple merge
Simple merge