From: Clément Bœsch Date: Thu, 23 Mar 2017 15:37:58 +0000 (+0100) Subject: Merge commit '7d8d726be7dc46343ab1c98c339c1ed44bcb07c1' X-Git-Tag: n3.3~394 X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=8892739a160594e390fbdcd3c8bccd9eb21e8104;hp=ddcd396075df5134491bc128c41c034898291cdb Merge commit '7d8d726be7dc46343ab1c98c339c1ed44bcb07c1' * commit '7d8d726be7dc46343ab1c98c339c1ed44bcb07c1': rtmpproto: Don't include a client version in the unencrypted C1 handshake Merged-by: Clément Bœsch --- diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index aa1cd8f539..9a85560e17 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -1228,10 +1228,7 @@ 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 - RTMP_CLIENT_VER1, - RTMP_CLIENT_VER2, - RTMP_CLIENT_VER3, - RTMP_CLIENT_VER4, + 0, 0, 0, 0, // zeros }; uint8_t clientdata[RTMP_HANDSHAKE_PACKET_SIZE]; uint8_t serverdata[RTMP_HANDSHAKE_PACKET_SIZE+1];