[FFmpeg-cvslog] http: cosmetics: reformat reconnect check for better readability

wm4 git at videolan.org
Mon Jan 15 13:39:07 EET 2018


ffmpeg | branch: master | wm4 <nfxjfg at googlemail.com> | Thu Jan 11 02:27:20 2018 +0100| [43e1ccfea186080b1c4cb4cd1e59ac1a3c3dc446] | committer: wm4

http: cosmetics: reformat reconnect check for better readability

The condition was a bit too long, and most editors will break the line
and turn it into an unreadable mess. Move out some of the conditions.

This should not change the behavior.

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

 libavformat/http.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/libavformat/http.c b/libavformat/http.c
index 510b23375a..aa80e314df 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -1449,12 +1449,18 @@ static int http_read_stream(URLContext *h, uint8_t *buf, int size)
         return http_buf_read_compressed(h, buf, size);
 #endif /* CONFIG_ZLIB */
     read_ret = http_buf_read(h, buf, size);
-    while ((read_ret  < 0           && s->reconnect        && (!h->is_streamed || s->reconnect_streamed) && s->filesize > 0 && s->off < s->filesize)
-        || (read_ret == AVERROR_EOF && s->reconnect_at_eof && (!h->is_streamed || s->reconnect_streamed))) {
+    while (read_ret < 0) {
         uint64_t target = h->is_streamed ? 0 : s->off;
 
         if (read_ret == AVERROR_EXIT)
-            return read_ret;
+            break;
+
+        if (h->is_streamed && !s->reconnect_streamed)
+            break;
+
+        if (!(s->reconnect && s->filesize > 0 && s->off < s->filesize) &&
+            !(s->reconnect_at_eof && read_ret == AVERROR_EOF))
+            break;
 
         if (reconnect_delay > s->reconnect_delay_max)
             return AVERROR(EIO);



More information about the ffmpeg-cvslog mailing list