ffmpeg | branch: master | Richard Shaffer <rshaf...@tunein.com> | Tue Apr 17 14:39:26 2018 +0800| [6a1be7561c870a8cd3cee86a57aabdffb19e3870] | committer: Steven Liu
avformat/hls: copy rw_timeout from parent to child AVIOContexts. The rw_timeout option is currently not applied when opening media playlist, segment, or encryption key URLs. This can cause the HLS demuxer to block indefinitely, even when the rw_timeout option has been specified. This change simply enables carrying over the rw_timeout option when the demuxer opens these URLs. Reviewed-by: Steven Liu <l...@chinaffmpeg.org> Signed-off-by: Richard Shaffer <rshaf...@tunein.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6a1be7561c870a8cd3cee86a57aabdffb19e3870 --- libavformat/hls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 2387d06e5f..3be708bd08 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1637,7 +1637,7 @@ static int save_avio_options(AVFormatContext *s) { HLSContext *c = s->priv_data; static const char * const opts[] = { - "headers", "http_proxy", "user_agent", "user-agent", "cookies", "referer", NULL }; + "headers", "http_proxy", "user_agent", "user-agent", "cookies", "referer", "rw_timeout", NULL }; const char * const * opt = opts; uint8_t *buf; int ret = 0; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog