From 2bd199082098054f567e4df2c2c1579a19081f10 Mon Sep 17 00:00:00 2001 From: lu_zero Date: Mon, 25 May 2009 17:51:10 +0000 Subject: Make sure -rtsp-stream-with-sctp is supported while building with libnemesi git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29321 b3059339-0415-0410-9bf9-f77b7e298cf2 --- cfg-common-opts.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'cfg-common-opts.h') diff --git a/cfg-common-opts.h b/cfg-common-opts.h index 291ed4c41c..a8945561d9 100644 --- a/cfg-common-opts.h +++ b/cfg-common-opts.h @@ -82,14 +82,18 @@ #ifdef CONFIG_LIVE555 {"sdp", "-sdp has been removed, use sdp://file instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, +#endif /* CONFIG_LIVE555 */ +#ifdef CONFIG_LIBNEMESI || CONFIG_LIVE555 // -rtsp-stream-over-tcp option, specifying TCP streaming of RTP/RTCP {"rtsp-stream-over-tcp", &rtspStreamOverTCP, CONF_TYPE_FLAG, 0, 0, 1, NULL}, -#elif defined (CONFIG_LIBNEMESI) - {"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 /* CONFIG_LIVE555 || CONFIG_LIBNEMESI */ +#ifdef CONFIG_LIBNEMESI {"rtsp-stream-over-sctp", &rtsp_transport_sctp, CONF_TYPE_FLAG, 0, 0, 1, NULL}, #else - {"rtsp-stream-over-tcp", "-rtsp-stream-over-tcp requires the \"LIVE555 Streaming Media\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, -#endif /* CONFIG_LIVE555 */ + {"rtsp-stream-over-sctp", "-rtsp-stream-over-sctp requires the", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, +#endif /* CONFIG_LIBNEMESI */ #ifdef CONFIG_NETWORK {"rtsp-port", &rtsp_port, CONF_TYPE_INT, CONF_RANGE, -1, 65535, NULL}, {"rtsp-destination", &rtsp_destination, CONF_TYPE_STRING, CONF_MIN, 0, 0, NULL}, -- cgit v1.2.3 From 97b04458edda99073e308be88ff46db26abc051d Mon Sep 17 00:00:00 2001 From: lu_zero Date: Mon, 25 May 2009 20:28:35 +0000 Subject: Unify over rtsp_transport_tcp as var to hold the -rtsp-stream-over-tcp flag and make sure libnemesi only builds are fine git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29322 b3059339-0415-0410-9bf9-f77b7e298cf2 --- cfg-common-opts.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cfg-common-opts.h') diff --git a/cfg-common-opts.h b/cfg-common-opts.h index a8945561d9..ee0cfcda4c 100644 --- a/cfg-common-opts.h +++ b/cfg-common-opts.h @@ -85,7 +85,7 @@ #endif /* CONFIG_LIVE555 */ #ifdef CONFIG_LIBNEMESI || CONFIG_LIVE555 // -rtsp-stream-over-tcp option, specifying TCP streaming of RTP/RTCP - {"rtsp-stream-over-tcp", &rtspStreamOverTCP, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"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 /* CONFIG_LIVE555 || CONFIG_LIBNEMESI */ -- cgit v1.2.3 From c9280563fe3519a4a305a28cff3ee2f4368a76a4 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 3 Jun 2009 13:42:11 +0000 Subject: CONFIG_LIBNEMESI and CONFIG_LIVE555 are not defined to 0/1 values. Thus, we cannot check for them in an #if directive, but have to use #if defined() instead. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29345 b3059339-0415-0410-9bf9-f77b7e298cf2 --- cfg-common-opts.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cfg-common-opts.h') diff --git a/cfg-common-opts.h b/cfg-common-opts.h index ee0cfcda4c..a3ad02e85f 100644 --- a/cfg-common-opts.h +++ b/cfg-common-opts.h @@ -83,12 +83,12 @@ #ifdef CONFIG_LIVE555 {"sdp", "-sdp has been removed, use sdp://file instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, #endif /* CONFIG_LIVE555 */ -#ifdef CONFIG_LIBNEMESI || 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 /* CONFIG_LIVE555 || CONFIG_LIBNEMESI */ +#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 -- cgit v1.2.3