Merge commit '4d6d70292e91a7ef027824d731b6b6570ceabf2f'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Oct 2013 11:53:12 +0000 (13:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Oct 2013 11:53:17 +0000 (13:53 +0200)
commitd32eec3359da9019fe8b4994397d16001433ce40
treebec889c3f0afdb91f36259c7f5aeab2fbce3d725
parent373d15525d3de87f419f87c4c69b32c265a47310
parent4d6d70292e91a7ef027824d731b6b6570ceabf2f
Merge commit '4d6d70292e91a7ef027824d731b6b6570ceabf2f'

* commit '4d6d70292e91a7ef027824d731b6b6570ceabf2f':
  rtmpproto: Pass the 'live' parameter in the right unit

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