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)
* commit 'fe0337e89bbbe84b7274fbb0d9d56ed992937931':
  rtmp: Do not send the first field twice within the handshake

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

Simple merge