Merge commit 'dccac759d39e761398d3d4172ae0b98c0186efa5' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 15:13:55 +0000 (17:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 15:13:58 +0000 (17:13 +0200)
commit10b8ae5b108d99e24cc8777f3a5e6f1e5dc509b3
tree02b3566dce08f69c834affedd4e1c7c1dec3f14e
parent63b38d4a91818c6aa6e842c9df7f27362b1223fa
parentdccac759d39e761398d3d4172ae0b98c0186efa5
Merge commit 'dccac759d39e761398d3d4172ae0b98c0186efa5' into release/1.1

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

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