Commit 6a1be756 authored by Richard Shaffer's avatar Richard Shaffer Committed by 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: 's avatarSteven Liu <lq@chinaffmpeg.org>
Signed-off-by: 's avatarRichard Shaffer <rshaffer@tunein.com>
parent 9e2b4c7e
...@@ -1637,7 +1637,7 @@ static int save_avio_options(AVFormatContext *s) ...@@ -1637,7 +1637,7 @@ static int save_avio_options(AVFormatContext *s)
{ {
HLSContext *c = s->priv_data; HLSContext *c = s->priv_data;
static const char * const opts[] = { 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; const char * const * opt = opts;
uint8_t *buf; uint8_t *buf;
int ret = 0; int ret = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment