Merge commit '744d813bcf527481f2217428fa08bfee8642935b' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 May 2015 19:07:02 +0000 (21:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 May 2015 19:07:02 +0000 (21:07 +0200)
* commit '744d813bcf527481f2217428fa08bfee8642935b':
  avresample: Reallocate the internal buffer to the correct size

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

Simple merge