Merge commit '9d02e38d3f03100784348ff75fd181d2aaad7e43' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 4 May 2014 18:14:18 +0000 (20:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 4 May 2014 18:14:18 +0000 (20:14 +0200)
commitb34fce9c5470ac5a5d7cd3bb522768e6df1e4c3a
tree481599e6559d52416cb5d022a7ff676fd1fad61f
parent742f9aa8792827fe8718247045ab64401c42e46e
parent9d02e38d3f03100784348ff75fd181d2aaad7e43
Merge commit '9d02e38d3f03100784348ff75fd181d2aaad7e43' into release/2.2

* commit '9d02e38d3f03100784348ff75fd181d2aaad7e43':
  lavr: allocate the resampling buffer with a positive size

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