From cc20fbcd39c7b60602edae4f7deb092ecfd3c975 Mon Sep 17 00:00:00 2001
From: Valeriy Argunov <hzdbyte@gmail.com>
Date: Sat, 16 Nov 2013 00:33:43 +0700
Subject: [PATCH] rtmphttp: Check for both 0 and AVERROR_EOF
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This makes RTMPT work again - it was broken by 5d876be87a.
Signed-off-by: Martin Storsjö <martin@martin.st>
---
libavformat/rtmphttp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/rtmphttp.c b/libavformat/rtmphttp.c
index 89a661435c2..34c68fb437e 100644
--- a/libavformat/rtmphttp.c
+++ b/libavformat/rtmphttp.c
@@ -113,7 +113,7 @@ static int rtmp_http_read(URLContext *h, uint8_t *buf, int size)
if (ret < 0 && ret != AVERROR_EOF)
return ret;
- if (ret == AVERROR_EOF) {
+ if (!ret || ret == AVERROR_EOF) {
if (rt->finishing) {
/* Do not send new requests when the client wants to
* close the connection. */
@@ -227,7 +227,7 @@ static int rtmp_http_open(URLContext *h, const char *uri, int flags)
/* read the server reply which contains a unique ID */
for (;;) {
ret = ffurl_read(rt->stream, rt->client_id + off, sizeof(rt->client_id) - off);
- if (ret == AVERROR_EOF)
+ if (!ret || ret == AVERROR_EOF)
break;
if (ret < 0)
goto fail;
--
GitLab