[FFmpeg-cvslog] Merge commit '963f76144897d3f7684d82ec21e51dd50ea1106e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 18 22:21:05 2014 +0200| [85cf049d5092cbcb8f81defeb8dcdb1f9a21ecf1] | committer: Michael Niedermayer

Merge commit '963f76144897d3f7684d82ec21e51dd50ea1106e'

* commit '963f76144897d3f7684d82ec21e51dd50ea1106e':
  avresample: Make sure the even check does not overflow

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

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