Browse Source

rtmp: Pass the proper return code in rtmp_handshake

Signed-off-by: Martin Storsjö <martin@martin.st>
tags/n1.0
Samuel Pitoiset Martin Storsjö 13 years ago
parent
commit
177bcc9593
1 changed files with 7 additions and 6 deletions
  1. +7
    -6
      libavformat/rtmpproto.c

+ 7
- 6
libavformat/rtmpproto.c View File

@@ -639,15 +639,16 @@ static int rtmp_handshake(URLContext *s, RTMPContext *rt)
return ret; return ret;
} }


i = ffurl_read_complete(rt->stream, serverdata, RTMP_HANDSHAKE_PACKET_SIZE + 1);
if (i != RTMP_HANDSHAKE_PACKET_SIZE + 1) {
if ((ret = ffurl_read_complete(rt->stream, serverdata,
RTMP_HANDSHAKE_PACKET_SIZE + 1)) < 0) {
av_log(s, AV_LOG_ERROR, "Cannot read RTMP handshake response\n"); av_log(s, AV_LOG_ERROR, "Cannot read RTMP handshake response\n");
return AVERROR(EIO);
return ret;
} }
i = ffurl_read_complete(rt->stream, clientdata, RTMP_HANDSHAKE_PACKET_SIZE);
if (i != RTMP_HANDSHAKE_PACKET_SIZE) {

if ((ret = ffurl_read_complete(rt->stream, clientdata,
RTMP_HANDSHAKE_PACKET_SIZE)) < 0) {
av_log(s, AV_LOG_ERROR, "Cannot read RTMP handshake response\n"); av_log(s, AV_LOG_ERROR, "Cannot read RTMP handshake response\n");
return AVERROR(EIO);
return ret;
} }


av_log(s, AV_LOG_DEBUG, "Server version %d.%d.%d.%d\n", av_log(s, AV_LOG_DEBUG, "Server version %d.%d.%d.%d\n",


Loading…
Cancel
Save