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

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

Simple merge