Mercurial > mplayer.hg
diff cfg-common.h @ 36359:dba1b5aa72c1
Move rtsp_transport_* variables to demuxer.c
Also make the corresponding command-line options always
available.
Most users will have some kind of rtsp support, possibly
through ffmpeg.
Putting it under CONFIG_NETWORKING would be more correct,
but doesn't seem worth the effort to me.
author | reimar |
---|---|
date | Sat, 21 Sep 2013 16:53:12 +0000 |
parents | 56f576e4a49d |
children | 19e0fc815a0e |
line wrap: on
line diff
--- a/cfg-common.h Sat Sep 21 16:39:24 2013 +0000 +++ b/cfg-common.h Sat Sep 21 16:53:12 2013 +0000 @@ -380,21 +380,10 @@ #ifdef CONFIG_LIVE555 {"sdp", "-sdp has been removed, use sdp://file instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, +#endif /* CONFIG_LIVE555 */ {"rtsp-stream-over-http", &rtsp_transport_http, CONF_TYPE_FLAG, 0, 0, 1, NULL}, -#else - {"rtsp-stream-over-http", "-rtsp-stream-over-http requires the \"LIVE555 Streaming Media\" library.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, -#endif /* CONFIG_LIVE555 */ -#if defined(CONFIG_LIBNEMESI) || defined(CONFIG_LIVE555) - // -rtsp-stream-over-tcp option, specifying TCP streaming of RTP/RTCP {"rtsp-stream-over-tcp", &rtsp_transport_tcp, CONF_TYPE_FLAG, 0, 0, 1, NULL}, -#else - {"rtsp-stream-over-tcp", "-rtsp-stream-over-tcp requires the \"LIVE555 Streaming Media\" or \"libnemesi\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, -#endif /* defined(CONFIG_LIBNEMESI) || defined(CONFIG_LIVE555) */ -#ifdef CONFIG_LIBNEMESI {"rtsp-stream-over-sctp", &rtsp_transport_sctp, CONF_TYPE_FLAG, 0, 0, 1, NULL}, -#else - {"rtsp-stream-over-sctp", "-rtsp-stream-over-sctp requires the \"libnemesi\" library\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, -#endif /* CONFIG_LIBNEMESI */ #ifdef CONFIG_NETWORKING {"rtsp-port", &rtsp_port, CONF_TYPE_INT, CONF_RANGE, -1, 65535, NULL}, {"rtsp-destination", &rtsp_destination, CONF_TYPE_STRING, CONF_MIN, 0, 0, NULL},