OSDN Git Service

Merge commit '72540e514ceaaed8ecb97ed63637b2a2a4447ab8'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Oct 2013 12:13:12 +0000 (14:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Oct 2013 12:17:53 +0000 (14:17 +0200)
commit205b6021358efa06c66e835dd4b265cf7cbc4047
treea73f43ad97cf1d44fb75be0f9153cbae0847e535
parentd32eec3359da9019fe8b4994397d16001433ce40
parent72540e514ceaaed8ecb97ed63637b2a2a4447ab8
Merge commit '72540e514ceaaed8ecb97ed63637b2a2a4447ab8'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtmpproto.c