diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-18 16:02:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-18 16:02:50 +0100 |
| commit | cbefb3d9098bd8c7bcac890e4e99de602f09c5bc (patch) | |
| tree | 13bf895d393b8a96f3622a42dab1ed846bbdad33 /libavformat | |
| parent | 74906d3727ec3bd9b7b28dfa7a98ff6e8cf8b6d7 (diff) | |
| parent | cc20fbcd39c7b60602edae4f7deb092ecfd3c975 (diff) | |
| download | ffmpeg-cbefb3d9098bd8c7bcac890e4e99de602f09c5bc.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmphttp: Check for both 0 and AVERROR_EOF
Conflicts:
libavformat/rtmphttp.c
See: d04b7de786780747878c080ba522405c6f542ccb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rtmphttp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/rtmphttp.c b/libavformat/rtmphttp.c index 8080b29cf9..0334ba558c 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 == 0 || 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 == 0 || ret == AVERROR_EOF) + if (!ret || ret == AVERROR_EOF) break; if (ret < 0) goto fail; |