aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2012-07-27 20:24:53 +0300
committerMartin Storsjö <martin@martin.st>2012-07-28 01:21:32 +0300
commit8ebacfb598933f66ff34ad1b12cb1aa14928ac73 (patch)
tree6571527f43a874bbed87440f80e23f6263d2db66
parent41ecbbc7aa3d491cc9d8d425634c5901eefa088a (diff)
downloadffmpeg-8ebacfb598933f66ff34ad1b12cb1aa14928ac73.tar.gz
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@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
-rw-r--r--libavformat/hls.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c
index 253463edf6..cda65cd362 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++;