[FFmpeg-cvslog] Revert "avformat/hls: copy rw_timeout from parent to child AVIOContexts."

Steven Liu git at videolan.org
Tue Apr 17 09:33:50 EEST 2018


ffmpeg | branch: master | Steven Liu <lq at chinaffmpeg.org> | Tue Apr 17 14:33:36 2018 +0800| [0b3c1854cb9893a05564f25594a48947e9a163e9] | committer: Steven Liu

Revert "avformat/hls: copy rw_timeout from parent to child AVIOContexts."

This reverts commit 36deec010cc87c8990477e1703dbf785212992b5.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0b3c1854cb9893a05564f25594a48947e9a163e9
---

 libavformat/hls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;



More information about the ffmpeg-cvslog mailing list