If the stream was aborted using the libavformat interrupt callback, we
don't want it to log the reconnect warning. (Exiting after logging this
warning worked well, so this is only for avoiding the ugly warning.)
---
I don't want to stick this as an additional condition into the 150
column while() condition, so it's a separate if.
---
 libavformat/http.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/http.c b/libavformat/http.c
index eb029e33a0..4806b1e59b 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -1452,6 +1452,9 @@ static int http_read_stream(URLContext *h, uint8_t *buf, 
int size)
         || (read_ret == AVERROR_EOF && s->reconnect_at_eof && (!h->is_streamed 
|| s->reconnect_streamed))) {
         uint64_t target = h->is_streamed ? 0 : s->off;
 
+        if (read_ret == AVERROR_EXIT)
+            return read_ret;
+
         if (reconnect_delay > s->reconnect_delay_max)
             return AVERROR(EIO);
 
-- 
2.15.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Reply via email to