[FFmpeg-cvslog] Merge commit '7d8d726be7dc46343ab1c98c339c1ed44bcb07c1'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Thu Mar 23 16:37:58 2017 +0100| [8892739a160594e390fbdcd3c8bccd9eb21e8104] | committer: Clément Bœsch

Merge commit '7d8d726be7dc46343ab1c98c339c1ed44bcb07c1'

* commit '7d8d726be7dc46343ab1c98c339c1ed44bcb07c1':
  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=8892739a160594e390fbdcd3c8bccd9eb21e8104
---

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

diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index aa1cd8f..9a85560 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];


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