* commit '76b19a39':
  Fix a number of incorrect intmath.h #includes.
  avconv: remove an unused variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>