Merge commit '76b19a3984359b3be44d4f7e4e69b7b86729a622'

* commit '76b19a3984359b3be44d4f7e4e69b7b86729a622':
  Fix a number of incorrect intmath.h #includes.
  avconv: remove an unused variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/arm/dca.h
index 3b341cf3da506970015487330d75904db2ec0f81,3e55e433c2c68c44c5699e0e39b47553b9bcff3e..2cfd18a837730da4cd9999e9a03d4ca73df1d016
--- 1/libavcodec/arm/dca.h
--- 2/libavcodec/arm/dca.h
+++ b/libavcodec/arm/dca.h
@@@ -22,10 -22,11 +22,11 @@@
  #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,

diff --cc libavcodec/dcadec.c
Simple merge

diff --cc libavcodec/fft-internal.h
Simple merge

diff --cc libavcodec/ra144dec.c
Simple merge

diff --cc libavcodec/ratecontrol.c
Simple merge