[FFmpeg-cvslog] r21160 - trunk/libavformat/rtmpproto.c

kostya subversion
Tue Jan 12 07:44:49 CET 2010


Author: kostya
Date: Tue Jan 12 07:44:49 2010
New Revision: 21160

Log:
Use old-style RTMP handshake for old servers.
This fixes issue streaming from Red5 server.
Patch by Art Clarke (aclarke@`echo xyzzy|sed s/y/u/|sed s/y/le/|tr z g`.com)

Modified:
   trunk/libavformat/rtmpproto.c

Modified: trunk/libavformat/rtmpproto.c
==============================================================================
--- trunk/libavformat/rtmpproto.c	Tue Jan 12 07:01:55 2010	(r21159)
+++ trunk/libavformat/rtmpproto.c	Tue Jan 12 07:44:49 2010	(r21160)
@@ -481,7 +481,7 @@ static int rtmp_handshake(URLContext *s,
     av_log(LOG_CONTEXT, AV_LOG_DEBUG, "Server version %d.%d.%d.%d\n",
            serverdata[5], serverdata[6], serverdata[7], serverdata[8]);
 
-    if (rt->is_input) {
+    if (rt->is_input && serverdata[5] >= 3) {
         server_pos = rtmp_validate_digest(serverdata + 1, 772);
         if (!server_pos) {
             server_pos = rtmp_validate_digest(serverdata + 1, 8);



More information about the ffmpeg-cvslog mailing list