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)
commit9b1a0c2ee82f3b99584857db1ea662e2d08aca7f
treeaa364f6228cb3d925e35a718e58684fdced69002
parent6fbddc80d63ddbc8974f4b2e286de20def6c201d
parent76b19a3984359b3be44d4f7e4e69b7b86729a622
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>
libavcodec/arm/dca.h
libavcodec/dcadec.c
libavcodec/fft-internal.h
libavcodec/ra144dec.c
libavcodec/ratecontrol.c