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)
* commit '9d02e38d3f03100784348ff75fd181d2aaad7e43':
  lavr: allocate the resampling buffer with a positive size

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

Simple merge