Index: cfg-common.h
===================================================================
--- cfg-common.h	(Revision 22216)
+++ cfg-common.h	(Arbeitskopie)
@@ -75,8 +75,10 @@
         {"sdp", "-sdp has been removed, use sdp://file instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
 	// -rtsp-stream-over-tcp option, specifying TCP streaming of RTP/RTCP
         {"rtsp-stream-over-tcp", &rtspStreamOverTCP, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+        {"rtsp-use-live555", &rtspUseLive555, 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},
+        {"rtsp-use-live555", "rtsp-use-live555 requires the \"LIVE555 Streaming Media\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif
 #ifdef MPLAYER_NETWORK
         {"rtsp-port", &rtsp_port, CONF_TYPE_INT, CONF_RANGE, -1, 65535, NULL},	
@@ -503,6 +505,7 @@
 
 #ifdef STREAMING_LIVE555
 extern int rtspStreamOverTCP;
+extern int rtspUseLive555;
 #endif
 extern int rtsp_port;
 extern char *rtsp_destination;
Index: stream/stream_rtsp.c
===================================================================
--- stream/stream_rtsp.c	(Revision 22216)
+++ stream/stream_rtsp.c	(Arbeitskopie)
@@ -43,6 +43,10 @@
 
 #define RTSP_DEFAULT_PORT 554
 
+#ifdef STREAMING_LIVE555
+int rtspUseLive555=0;
+#endif
+
 extern int network_bandwidth;
 
 static int
@@ -142,6 +146,10 @@
   URL_t *url;
   extern int index_mode;
   
+#ifdef STREAMING_LIVE555
+  if (rtspUseLive555) return STREAM_UNSUPORTED;
+#endif
+
   mp_msg (MSGT_OPEN, MSGL_V, "STREAM_RTSP, URL: %s\n", stream->url);
   stream->streaming_ctrl = streaming_ctrl_new ();
   if (!stream->streaming_ctrl)