[FFmpeg-cvslog] Merge commit '76b19a3984359b3be44d4f7e4e69b7b86729a622'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 26 12:56:46 2013 +0100| [9b1a0c2ee82f3b99584857db1ea662e2d08aca7f] | committer: Michael Niedermayer

Merge commit '76b19a3984359b3be44d4f7e4e69b7b86729a622'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9b1a0c2ee82f3b99584857db1ea662e2d08aca7f
---