Merge commit '0ac8ff618c5e6d878c547a8877e714ed728950ce'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 03:46:20 +0000 (05:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 03:46:35 +0000 (05:46 +0200)
commit215430e049b78fc4c3d1cb8f6086bcd4bae0375e
tree0c9e554b3328f6d46341ec51724a221c398cfd29
parent639781492684fcad05da52e7700bcbf6086599ea
parent0ac8ff618c5e6d878c547a8877e714ed728950ce
Merge commit '0ac8ff618c5e6d878c547a8877e714ed728950ce'

* commit '0ac8ff618c5e6d878c547a8877e714ed728950ce':
  avresample: Reallocate the internal buffer to the correct size

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