[MPlayer-cvslog] r29345 - trunk/cfg-common-opts.h

[diego]

Author: diego
Date: Wed Jun  3 15:42:11 2009
New Revision: 29345

Log:
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.

Modified:
   trunk/cfg-common-opts.h

Modified: trunk/cfg-common-opts.h
==============================================================================
--- trunk/cfg-common-opts.h	Tue Jun  2 20:37:31 2009	(r29344)
+++ trunk/cfg-common-opts.h	Wed Jun  3 15:42:11 2009	(r29345)
@@ -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