Browse Source

rtmphttp: Check for both 0 and AVERROR_EOF

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

Signed-off-by: Martin Storsjö <martin@martin.st>
tags/n2.2-rc1
Valeriy Argunov Martin Storsjö 11 years ago
parent
commit
cc20fbcd39
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      libavformat/rtmphttp.c

+ 2
- 2
libavformat/rtmphttp.c View File

@@ -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;


Loading…
Cancel
Save