1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Merge commit '7d8d726be7dc46343ab1c98c339c1ed44bcb07c1'

* commit '7d8d726be7dc46343ab1c98c339c1ed44bcb07c1':
  rtmpproto: Don't include a client version in the unencrypted C1 handshake

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-03-23 16:37:58 +01:00
commit 8892739a16

View File

@ -1228,10 +1228,7 @@ static int rtmp_handshake(URLContext *s, RTMPContext *rt)
uint8_t tosend [RTMP_HANDSHAKE_PACKET_SIZE+1] = { uint8_t tosend [RTMP_HANDSHAKE_PACKET_SIZE+1] = {
3, // unencrypted data 3, // unencrypted data
0, 0, 0, 0, // client uptime 0, 0, 0, 0, // client uptime
RTMP_CLIENT_VER1, 0, 0, 0, 0, // zeros
RTMP_CLIENT_VER2,
RTMP_CLIENT_VER3,
RTMP_CLIENT_VER4,
}; };
uint8_t clientdata[RTMP_HANDSHAKE_PACKET_SIZE]; uint8_t clientdata[RTMP_HANDSHAKE_PACKET_SIZE];
uint8_t serverdata[RTMP_HANDSHAKE_PACKET_SIZE+1]; uint8_t serverdata[RTMP_HANDSHAKE_PACKET_SIZE+1];