[FFmpeg-cvslog] Merge commit 'e1a57cbb1c2752feb9315f748836dc44e58d2dc6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 15 21:41:46 2015 +0100| [2870b86c2a9fac3a52b82604e4b8aaf7360da04e] | committer: Michael Niedermayer

Merge commit 'e1a57cbb1c2752feb9315f748836dc44e58d2dc6'

* commit 'e1a57cbb1c2752feb9315f748836dc44e58d2dc6':
  ape: Use the proper variable type

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

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