Merge commit 'fe0337e89bbbe84b7274fbb0d9d56ed992937931'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 09:34:24 +0000 (11:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 09:34:30 +0000 (11:34 +0200)
commit9589b6190494e91517e4a54bb7a565ecdf05bda8
treefba440f5f01992c9722912aaf8d2df82c83995f6
parentc9eb2ce085327ef9631602d215ece53888bc4e32
parentfe0337e89bbbe84b7274fbb0d9d56ed992937931
Merge commit 'fe0337e89bbbe84b7274fbb0d9d56ed992937931'

* commit 'fe0337e89bbbe84b7274fbb0d9d56ed992937931':
  rtmp: Do not send the first field twice within the handshake

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