]> git.sesse.net Git - ffmpeg/commitdiff
Revert "avformat/hls: copy rw_timeout from parent to child AVIOContexts."
authorSteven Liu <lq@chinaffmpeg.org>
Tue, 17 Apr 2018 06:33:36 +0000 (14:33 +0800)
committerSteven Liu <lq@chinaffmpeg.org>
Tue, 17 Apr 2018 06:33:36 +0000 (14:33 +0800)
This reverts commit 36deec010cc87c8990477e1703dbf785212992b5.

libavformat/hls.c

index 3be708bd08f30baff62627e78ec19488ca0d4f22..2387d06e5f7709840014e6ab48f7565de3ceebba 100644 (file)
@@ -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;