[libav-commits] hls: Proceed to the next segment at any error code

Martin Storsjö git at libav.org
Sat Jul 28 00:23:34 CEST 2012


Module: libav
Branch: master
Commit: 8ebacfb598933f66ff34ad1b12cb1aa14928ac73

Author:    Martin Storsjö <martin at martin.st>
Committer: Martin Storsjö <martin at martin.st>
Date:      Fri Jul 27 20:24:53 2012 +0300

hls: Proceed to the next segment at any error code

Previously, we returned any error code except AVERROR_EOF to the
caller - only if AVERROR_EOF or 0 was returned, we proceeded to
the next segment.

With some setups of web servers, using Connection: close in https
and GnuTLS, we don't get a clean error code at the end of segments.
In those cases, just proceed to the next segment.

Tested-by: Antti Seppälä <a.seppala at gmail.com>
Signed-off-by: Martin Storsjö <martin at martin.st>

---

 libavformat/hls.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/libavformat/hls.c b/libavformat/hls.c
index 253463e..cda65cd 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -420,8 +420,6 @@ reload:
     ret = ffurl_read(v->input, buf, buf_size);
     if (ret > 0)
         return ret;
-    if (ret < 0 && ret != AVERROR_EOF)
-        return ret;
     ffurl_close(v->input);
     v->input = NULL;
     v->cur_seq_no++;



More information about the libav-commits mailing list