har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtmphttp: Check for both 0 and AVERROR_EOF

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

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Valeriy Argunov 2013-11-16 00:33:43 +07:00 committed by Martin Storsjö
parent 1c01b0253e
commit cc20fbcd39
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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) if (ret < 0 && ret != AVERROR_EOF)
return ret; return ret;
if (ret == AVERROR_EOF) { if (!ret || ret == AVERROR_EOF) {
if (rt->finishing) { if (rt->finishing) {
/* Do not send new requests when the client wants to /* Do not send new requests when the client wants to
* close the connection. */ * 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 */ /* read the server reply which contains a unique ID */
for (;;) { for (;;) {
ret = ffurl_read(rt->stream, rt->client_id + off, sizeof(rt->client_id) - off); ret = ffurl_read(rt->stream, rt->client_id + off, sizeof(rt->client_id) - off);
if (ret == AVERROR_EOF) if (!ret || ret == AVERROR_EOF)
break; break;
if (ret < 0) if (ret < 0)
goto fail; goto fail;