From: Andreas Rheinhardt <andreas.rheinha...@gmail.com>
Deprecated in ff46124b0df17a1d35249e09ae8eae9a61f16e04.
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@gmail.com>
---
doc/protocols.texi | 12 +-----------
libavformat/rtsp.c | 8 --------
libavformat/version.h | 3 ---
3 files changed, 1 insertion(+), 22 deletions(-)
diff --git a/doc/protocols.texi b/doc/protocols.texi
index 2cc2b561de..8371f83059 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -1161,12 +1161,6 @@ Set minimum local UDP port. Default value is 5000.
@item max_port
Set maximum local UDP port. Default value is 65000.
-@item timeout
-This option is deprecated. Use @option{listen_timeout} instead. Set maximum
timeout (in seconds) to wait for incoming connections.
-
-A value of -1 means infinite (default). This option implies the
-@option{rtsp_flags} set to @samp{listen}.
-
@item listen_timeout
Set maximum timeout (in seconds) to establish an initial connection. Setting
@option{listen_timeout} > 0 sets @option{rtsp_flags} to @samp{listen}. Default
is -1
@@ -1175,13 +1169,9 @@ which means an infinite timeout when @samp{listen} mode
is set.
@item reorder_queue_size
Set number of packets to buffer for handling of reordered packets.
-@item stimeout
+@item timeout
Set socket TCP I/O timeout in microseconds.
-@item user-agent
-This option is deprecated. Use @option{user_agent} instead. Override
User-Agent header. If not specified, it defaults to the
-libavformat identifier string.
-
@item user_agent
Override User-Agent header. If not specified, it defaults to the
libavformat identifier string.
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 25bdf475b3..a8c5a641cb 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -94,17 +94,9 @@ const AVOption ff_rtsp_options[] = {
{ "min_port", "set minimum local UDP port", OFFSET(rtp_port_min),
AV_OPT_TYPE_INT, {.i64 = RTSP_RTP_PORT_MIN}, 0, 65535, DEC|ENC },
{ "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|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 },
-#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 },
-#endif
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|AV_OPT_FLAG_DEPRECATED },
-#endif
{ NULL },
};
diff --git a/libavformat/version.h b/libavformat/version.h
index 3e82007383..230ebd8a3e 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -58,9 +58,6 @@
#ifndef FF_API_LAVF_AVCTX
#define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif
-#ifndef FF_API_OLD_RTSP_OPTIONS
-#define FF_API_OLD_RTSP_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 59)
-#endif
#ifndef FF_API_DASH_MIN_SEG_DURATION
#define FF_API_DASH_MIN_SEG_DURATION (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif
--
2.31.1
_______________________________________________
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".
