[FFmpeg-cvslog] Merge commit 'dccac759d39e761398d3d4172ae0b98c0186efa5' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 17:13:55 2014 +0200| [10b8ae5b108d99e24cc8777f3a5e6f1e5dc509b3] | committer: Michael Niedermayer

Merge commit 'dccac759d39e761398d3d4172ae0b98c0186efa5' into release/1.1

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=10b8ae5b108d99e24cc8777f3a5e6f1e5dc509b3
---