From 177bcc9593a5f43ccf0697b9c7a1caa5935686b7 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 24 May 2012 13:48:42 +0200 Subject: rtmp: Pass the proper return code in rtmp_handshake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- libavformat/rtmpproto.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'libavformat') diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 1f78d1c322..9af4584226 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -639,15 +639,16 @@ static int rtmp_handshake(URLContext *s, RTMPContext *rt) 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"); - 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"); - return AVERROR(EIO); + return ret; } av_log(s, AV_LOG_DEBUG, "Server version %d.%d.%d.%d\n", -- cgit v1.2.3