[FFmpeg-cvslog] Merge commit '72540e514ceaaed8ecb97ed63637b2a2a4447ab8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct  4 14:13:12 2013 +0200| [205b6021358efa06c66e835dd4b265cf7cbc4047] | committer: Michael Niedermayer

Merge commit '72540e514ceaaed8ecb97ed63637b2a2a4447ab8'

* commit '72540e514ceaaed8ecb97ed63637b2a2a4447ab8':
  rtmpproto: Clear the flv allocation size on reallocp failures

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

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