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)
commit9bcc430481d7d1039be03802b91b2a52fef84e5b
tree9ef4c4c8dcfe776e11c8f21ae766818a027279a0
parent733db64ce0c66214d7461fe0fdac097cd3c38a16
parent088eca28164c8cd3b72b0c3d3f9e3fe5ee5cb28f
Merge commit '088eca28164c8cd3b72b0c3d3f9e3fe5ee5cb28f'

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

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