Merge commit '7d8d726be7dc46343ab1c98c339c1ed44bcb07c1'
authorClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 15:37:58 +0000 (16:37 +0100)
committerClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 15:37:58 +0000 (16:37 +0100)
* commit '7d8d726be7dc46343ab1c98c339c1ed44bcb07c1':
  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