mirror of https://git.ffmpeg.org/ffmpeg.git
lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft
This commit is contained in:
parent
f0cb13958d
commit
adad5b88f8
|
@ -1394,51 +1394,6 @@ redirect:
|
||||||
if (port < 0)
|
if (port < 0)
|
||||||
port = RTSP_DEFAULT_PORT;
|
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)
|
if (!lower_transport_mask)
|
||||||
lower_transport_mask = (1 << RTSP_LOWER_TRANSPORT_NB) - 1;
|
lower_transport_mask = (1 << RTSP_LOWER_TRANSPORT_NB) - 1;
|
||||||
|
|
||||||
|
|
|
@ -47,9 +47,6 @@
|
||||||
* Those FF_API_* defines are not part of public API.
|
* Those FF_API_* defines are not part of public API.
|
||||||
* They may change, break or disappear at any time.
|
* They may change, break or disappear at any time.
|
||||||
*/
|
*/
|
||||||
#ifndef FF_API_RTSP_URL_OPTIONS
|
|
||||||
#define FF_API_RTSP_URL_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 54)
|
|
||||||
#endif
|
|
||||||
#ifndef FF_API_NEW_STREAM
|
#ifndef FF_API_NEW_STREAM
|
||||||
#define FF_API_NEW_STREAM (LIBAVFORMAT_VERSION_MAJOR < 54)
|
#define FF_API_NEW_STREAM (LIBAVFORMAT_VERSION_MAJOR < 54)
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue