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)
commit4e43c6df54e4450765f8cb5f6d52fa68ca9f473d
tree2c567566f5108a017412e14c44232d99075fb72f
parente59a4d1df75f834dd0993f491d532eac651d6eee
parentc541a44e029e8a4f21db028c34fee3ad1c10a409
Merge commit 'c541a44e029e8a4f21db028c34fee3ad1c10a409'

* commit 'c541a44e029e8a4f21db028c34fee3ad1c10a409':
  Revert "rtmpproto: Don't include a client version in the unencrypted C1 handshake"

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