rtsp options should be available for mencoder as well
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Tue, 18 Apr 2006 11:06:35 +0000 (11:06 +0000)
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Tue, 18 Apr 2006 11:06:35 +0000 (11:06 +0000)
git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@18136 b3059339-0415-0410-9bf9-f77b7e298cf2

cfg-common.h
cfg-mplayer.h

index a2f54dd..a32d626 100644 (file)
        {"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 char *fribidi_charset;
 extern int flip_hebrew;
 #endif
 
+#ifdef STREAMING_LIVE555
+extern int rtspStreamOverTCP;
+extern int rtsp_port;
+#endif
+
 
 extern int audio_stream_cache;
 
index ce535d0..2f656a5 100644 (file)
@@ -83,12 +83,6 @@ extern void vo_zr_revertoption(m_option_t* opt,char* pram);
 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 @@ m_option_t mplayer_opts[]={
        {"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 ------------------------