[FFmpeg-cvslog] Merge commit '0ac8ff618c5e6d878c547a8877e714ed728950ce'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 29 05:46:20 2015 +0200| [215430e049b78fc4c3d1cb8f6086bcd4bae0375e] | committer: Michael Niedermayer

Merge commit '0ac8ff618c5e6d878c547a8877e714ed728950ce'

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

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

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