[FFmpeg-cvslog] Merge commit '4d6d70292e91a7ef027824d731b6b6570ceabf2f'

[Michael Niedermayer]

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

Merge commit '4d6d70292e91a7ef027824d731b6b6570ceabf2f'

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

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

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