[FFmpeg-cvslog] Merge commit '088eca28164c8cd3b72b0c3d3f9e3fe5ee5cb28f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 18 22:13:30 2014 +0200| [9bcc430481d7d1039be03802b91b2a52fef84e5b] | committer: Michael Niedermayer

Merge commit '088eca28164c8cd3b72b0c3d3f9e3fe5ee5cb28f'

* commit '088eca28164c8cd3b72b0c3d3f9e3fe5ee5cb28f':
  avresample: prevent theoretical division by zero

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

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