Merge commit '963f76144897d3f7684d82ec21e51dd50ea1106e'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 20:21:05 +0000 (22:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 20:53:23 +0000 (22:53 +0200)
commit85cf049d5092cbcb8f81defeb8dcdb1f9a21ecf1
tree4923ed49011a1501d25f961bd43c275504008295
parent9bcc430481d7d1039be03802b91b2a52fef84e5b
parent963f76144897d3f7684d82ec21e51dd50ea1106e
Merge commit '963f76144897d3f7684d82ec21e51dd50ea1106e'

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

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