Merge commit '088eca28164c8cd3b72b0c3d3f9e3fe5ee5cb28f'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 20:13:30 +0000 (22:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 20:15:23 +0000 (22:15 +0200)
* commit '088eca28164c8cd3b72b0c3d3f9e3fe5ee5cb28f':
  avresample: prevent theoretical division by zero

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavresample/utils.c

Simple merge