# HG changeset patch
# User reimar
# Date 1145358395 0
# Node ID ebb9806d7dda5fc7feb70aa9b4d07958c5a94bd1
# Parent  615c90c6a4e4e29f096d934d42918ca0410bf580
rtsp options should be available for mencoder as well

diff -r 615c90c6a4e4 -r ebb9806d7dda cfg-common.h
--- a/cfg-common.h	Tue Apr 18 10:24:22 2006 +0000
+++ b/cfg-common.h	Tue Apr 18 11:06:35 2006 +0000
@@ -71,6 +71,15 @@
 	{"user-agent", "MPlayer was compiled without streaming (network) support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif
 
+#ifdef STREAMING_LIVE555
+        {"sdp", "-sdp is obsolete, 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-port", &rtsp_port, CONF_TYPE_INT, CONF_RANGE, -1, 65535, NULL},
+#else
+	{"rtsp-stream-over-tcp", "RTSP support requires the \"LIVE555 Streaming Media\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+        {"rtsp-port", "RTSP support requires the \"LIVE555 Streaming Media\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+#endif
 	
 // ------------------------- demuxer options --------------------
 
@@ -414,6 +423,11 @@
 extern int flip_hebrew;
 #endif
 
+#ifdef STREAMING_LIVE555
+extern int rtspStreamOverTCP;
+extern int rtsp_port;
+#endif
+
 
 extern int audio_stream_cache;
 
diff -r 615c90c6a4e4 -r ebb9806d7dda cfg-mplayer.h
--- a/cfg-mplayer.h	Tue Apr 18 10:24:22 2006 +0000
+++ b/cfg-mplayer.h	Tue Apr 18 11:06:35 2006 +0000
@@ -83,12 +83,6 @@
 extern m_option_t dxr2_opts[];
 #endif
 
-#ifdef STREAMING_LIVE555
-extern int isSDPFile;
-extern int rtspStreamOverTCP;
-extern int rtsp_port;
-#endif
-
 #ifdef HAVE_NEW_GUI
 extern char * skinName;
 extern int enqueue;
@@ -293,15 +287,6 @@
 	{"dxr2", &dxr2_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 #endif
 
-#ifdef STREAMING_LIVE555
-        {"sdp", "-sdp is obsolete, 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-port", &rtsp_port, CONF_TYPE_INT, CONF_RANGE, -1, 65535, NULL},
-#else
-	{"rtsp-stream-over-tcp", "RTSP support requires the \"LIVE555 Streaming Media\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-        {"rtsp-port", "RTSP support requires the \"LIVE555 Streaming Media\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-#endif
 
 //---------------------- mplayer-only options ------------------------