> On Dec 8, 2020, at 12:08 PM, Andriy Gelman <andriy.gel...@gmail.com> wrote: > > On Sun, 15. Nov 13:20, Andriy Gelman wrote: >> From: Andriy Gelman <andriy.gel...@gmail.com> >> >> Signed-off-by: Andriy Gelman <andriy.gel...@gmail.com> >> --- >> libavformat/rtsp.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c >> index d9832bbf1f..2ef75f50e3 100644 >> --- a/libavformat/rtsp.c >> +++ b/libavformat/rtsp.c >> @@ -94,7 +94,7 @@ const AVOption ff_rtsp_options[] = { >> { "max_port", "set maximum local UDP port", OFFSET(rtp_port_max), >> AV_OPT_TYPE_INT, {.i64 = RTSP_RTP_PORT_MAX}, 0, 65535, DEC|ENC }, >> { "listen_timeout", "set maximum timeout (in seconds) to wait for >> incoming connections (-1 is infinite, imply flag listen)", >> OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC >> }, >> #if FF_API_OLD_RTSP_OPTIONS >> - { "timeout", "set maximum timeout (in seconds) to wait for incoming >> connections (-1 is infinite, imply flag listen) (deprecated, use >> listen_timeout)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, >> INT_MIN, INT_MAX, DEC }, >> + { "timeout", "set maximum timeout (in seconds) to wait for incoming >> connections (-1 is infinite, imply flag listen) (deprecated, use >> listen_timeout)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, >> INT_MIN, INT_MAX, DEC|AV_OPT_FLAG_DEPRECATED }, >> { "stimeout", "set timeout (in microseconds) of socket TCP I/O >> operations", OFFSET(stimeout), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, >> INT_MAX, DEC },
Looks good to me, although it’s a little weird that after major bump “timeout” will have a different meaning instead of being dropped. “stimeout” is deprecated, since there is not other option to replace it at the current time, it cannot be marked as AV_OPT_FLAG_DEPRECATED. >> #else >> { "timeout", "set timeout (in microseconds) of socket TCP I/O >> operations", OFFSET(stimeout), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, >> INT_MAX, DEC }, >> @@ -102,7 +102,7 @@ const AVOption ff_rtsp_options[] = { >> COMMON_OPTS(), >> { "user_agent", "override User-Agent header", OFFSET(user_agent), >> AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, DEC }, >> #if FF_API_OLD_RTSP_OPTIONS >> - { "user-agent", "override User-Agent header (deprecated, use >> user_agent)", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = >> LIBAVFORMAT_IDENT}, 0, 0, DEC }, >> + { "user-agent", "override User-Agent header (deprecated, use >> user_agent)", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = >> LIBAVFORMAT_IDENT}, 0, 0, DEC|AV_OPT_FLAG_DEPRECATED }, >> #endif >> { NULL }, >> }; >> -- >> 2.28.0 >> > > ping for the series. > > Thanks, > -- > Andriy > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe". _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".