summaryrefslogtreecommitdiff
path: root/libavformat/rtsp.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-01-12 13:31:55 +0100
committerAnton Khirnov <anton@khirnov.net>2012-01-27 10:52:43 +0100
commitadad5b88f8e0c9227862dadb09c74c379f609c8c (patch)
tree4b2d057f978ef90f3b771e6039a904cb0b31d737 /libavformat/rtsp.c
parentf0cb13958d8b45800f29b067ce2bc6e9f5f58740 (diff)
lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft
Diffstat (limited to 'libavformat/rtsp.c')
-rw-r--r--libavformat/rtsp.c45
1 files changed, 0 insertions, 45 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 0c42829d39..c47cb0e4f1 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1394,51 +1394,6 @@ redirect:
if (port < 0)
port = RTSP_DEFAULT_PORT;
-#if FF_API_RTSP_URL_OPTIONS
- /* search for options */
- option_list = strrchr(path, '?');
- if (option_list) {
- /* Strip out the RTSP specific options, write out the rest of
- * the options back into the same string. */
- filename = option_list;
- while (option_list) {
- int handled = 1;
- /* move the option pointer */
- option = ++option_list;
- option_list = strchr(option_list, '&');
- if (option_list)
- *option_list = 0;
-
- /* handle the options */
- if (!strcmp(option, "udp")) {
- lower_transport_mask |= (1<< RTSP_LOWER_TRANSPORT_UDP);
- } else if (!strcmp(option, "multicast")) {
- lower_transport_mask |= (1<< RTSP_LOWER_TRANSPORT_UDP_MULTICAST);
- } else if (!strcmp(option, "tcp")) {
- lower_transport_mask |= (1<< RTSP_LOWER_TRANSPORT_TCP);
- } else if(!strcmp(option, "http")) {
- lower_transport_mask |= (1<< RTSP_LOWER_TRANSPORT_TCP);
- rt->control_transport = RTSP_MODE_TUNNEL;
- } else if (!strcmp(option, "filter_src")) {
- rt->rtsp_flags |= RTSP_FLAG_FILTER_SRC;
- } else {
- /* Write options back into the buffer, using memmove instead
- * of strcpy since the strings may overlap. */
- int len = strlen(option);
- memmove(++filename, option, len);
- filename += len;
- if (option_list) *filename = '&';
- handled = 0;
- }
- if (handled)
- av_log(s, AV_LOG_WARNING, "Options passed via URL are "
- "deprecated, use -rtsp_transport "
- "and -rtsp_flags instead.\n");
- }
- *filename = 0;
- }
-#endif
-
if (!lower_transport_mask)
lower_transport_mask = (1 << RTSP_LOWER_TRANSPORT_NB) - 1;