diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-27 22:21:18 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-27 22:21:18 +0200 |
| commit | 4e43c6df54e4450765f8cb5f6d52fa68ca9f473d (patch) | |
| tree | 2c567566f5108a017412e14c44232d99075fb72f /libavformat/rtmpproto.c | |
| parent | e59a4d1df75f834dd0993f491d532eac651d6eee (diff) | |
| parent | c541a44e029e8a4f21db028c34fee3ad1c10a409 (diff) | |
| download | ffmpeg-4e43c6df54e4450765f8cb5f6d52fa68ca9f473d.tar.gz | |
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>
Diffstat (limited to 'libavformat/rtmpproto.c')
| -rw-r--r-- | libavformat/rtmpproto.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 9a85560e17..aa1cd8f539 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]; |