Mercurial > mplayer.hg

changeset 29303:4f26b760cb37

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author diego
date Wed, 03 Jun 2009 13:42:11 +0000
parents ce8edb0e2897
children cdd4453294c0
files cfg-common-opts.h
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/cfg-common-opts.h	Tue Jun 02 18:37:31 2009 +0000
+++ b/cfg-common-opts.h	Wed Jun 03 13:42:11 2009 +0000
@@ -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