diff options
| author | Steven Liu <lq@chinaffmpeg.org> | 2018-04-17 14:25:07 +0800 |
|---|---|---|
| committer | Steven Liu <lq@chinaffmpeg.org> | 2018-04-17 14:25:07 +0800 |
| commit | 36deec010cc87c8990477e1703dbf785212992b5 (patch) | |
| tree | 893bb09d1d219f72f56d64481cca8652572a8042 /libavformat | |
| parent | 4effd1c4a2c52a68c25ed0bc5474f6b4c64fd644 (diff) | |
| download | ffmpeg-36deec010cc87c8990477e1703dbf785212992b5.tar.gz | |
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 <lq@chinaffmpeg.org>
Signed-off-by: Richard Shaffer <rshaffer@tunein.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/hls.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |