[FFmpeg-cvslog] Merge commit 'c541a44e029e8a4f21db028c34fee3ad1c10a409'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Mon Mar 27 22:21:18 2017 +0200| [4e43c6df54e4450765f8cb5f6d52fa68ca9f473d] | committer: Clément Bœsch

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 at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4e43c6df54e4450765f8cb5f6d52fa68ca9f473d
---

 libavformat/rtmpproto.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 9a85560..aa1cd8f 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -1228,7 +1228,10 @@ static int rtmp_handshake(URLContext *s, RTMPContext *rt)
     uint8_t tosend    [RTMP_HANDSHAKE_PACKET_SIZE+1] = {
         3,                // unencrypted data
         0, 0, 0, 0,       // client uptime
-        0, 0, 0, 0,       // zeros
+        RTMP_CLIENT_VER1,
+        RTMP_CLIENT_VER2,
+        RTMP_CLIENT_VER3,
+        RTMP_CLIENT_VER4,
     };
     uint8_t clientdata[RTMP_HANDSHAKE_PACKET_SIZE];
     uint8_t serverdata[RTMP_HANDSHAKE_PACKET_SIZE+1];


======================================================================