[FFmpeg-cvslog] rtmphttp: Check for both 0 and AVERROR_EOF

[Valeriy Argunov]

ffmpeg | branch: master | Valeriy Argunov <hzdbyte at gmail.com> | Sat Nov 16 00:33:43 2013 +0700| [cc20fbcd39c7b60602edae4f7deb092ecfd3c975] | committer: Martin Storsjö

rtmphttp: Check for both 0 and AVERROR_EOF

This makes RTMPT work again - it was broken by 5d876be87a.

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cc20fbcd39c7b60602edae4f7deb092ecfd3c975
---

 libavformat/rtmphttp.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/rtmphttp.c b/libavformat/rtmphttp.c
index 89a6614..34c68fb 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;