Merge commit 'c541a44e029e8a4f21db028c34fee3ad1c10a409'
authorClément Bœsch <u@pkh.me>
Mon, 27 Mar 2017 20:21:18 +0000 (22:21 +0200)
committerClément Bœsch <u@pkh.me>
Mon, 27 Mar 2017 20:21:18 +0000 (22:21 +0200)
* commit 'c541a44e029e8a4f21db028c34fee3ad1c10a409':
  Revert "rtmpproto: Don't include a client version in the unencrypted C1 handshake"

Merged-by: Clément Bœsch <u@pkh.me>
1  2 
libavformat/rtmpproto.c

Simple merge