[FFmpeg-cvslog] Merge commit 'ac976ed91e323754e9a84509873ebdb437372797'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 13 14:28:51 2014 +0200| [c11aa9d29aaea7a9f6952d17707eb549fd32c65e] | committer: Michael Niedermayer

Merge commit 'ac976ed91e323754e9a84509873ebdb437372797'

* commit 'ac976ed91e323754e9a84509873ebdb437372797':
  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=c11aa9d29aaea7a9f6952d17707eb549fd32c65e
---