[FFmpeg-cvslog] Revert "avformat/rtmpproto: Pass rw_timeout to underlying transport protocol"

Zhao Zhili git at videolan.org
Sat Nov 25 05:06:57 EET 2023


ffmpeg | branch: master | Zhao Zhili <zhilizhao at tencent.com> | Sat Nov 25 10:50:35 2023 +0800| [bbdedd966312f72cb8d4ed6292ef233de0b23952] | committer: Zhao Zhili

Revert "avformat/rtmpproto: Pass rw_timeout to underlying transport protocol"

This reverts commit bec6dfcd5c0b59dd6d947ec3074986aeffd525aa.

The patch is NOP since ffurl_open_whitelist copy options from parent
automatically.

Signed-off-by: Zhao Zhili <zhilizhao at tencent.com>

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

 libavformat/rtmpproto.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index a0c6195eb2..98718bc6da 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -2635,9 +2635,6 @@ static int rtmp_open(URLContext *s, const char *uri, int flags, AVDictionary **o
 
     if (rt->listen_timeout > 0)
         rt->listen = 1;
-    /* Pass rw_timeout to underlying transport protocol */
-    if (s->rw_timeout > 0)
-        av_dict_set_int(opts, "rw_timeout", s->rw_timeout, 0);
 
     rt->is_input = !(flags & AVIO_FLAG_WRITE);
 



More information about the ffmpeg-cvslog mailing list