summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorSteven Liu <lq@chinaffmpeg.org>2018-04-17 14:33:36 +0800
committerSteven Liu <lq@chinaffmpeg.org>2018-04-17 14:33:36 +0800
commit0b3c1854cb9893a05564f25594a48947e9a163e9 (patch)
tree9a914a7ac8d619da1a36384f5289c9e0105e012e /libavformat
parent6eaaad37f89ec31ef07ec9338a79fbdd6b93ae98 (diff)
Revert "avformat/hls: copy rw_timeout from parent to child AVIOContexts."
This reverts commit 36deec010cc87c8990477e1703dbf785212992b5.
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/hls.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c
index 3be708bd08..2387d06e5f 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", "rw_timeout", NULL };
+ "headers", "http_proxy", "user_agent", "user-agent", "cookies", "referer", NULL };
const char * const * opt = opts;
uint8_t *buf;
int ret = 0;