rtsp options should be available for mencoder as well

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18136 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-04-18 11:06:35 +00:00
parent 1dca024357
commit b7942efd63
2 changed files with 14 additions and 15 deletions

View File

@ -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 char *fribidi_charset;
extern int flip_hebrew;
#endif
#ifdef STREAMING_LIVE555
extern int rtspStreamOverTCP;
extern int rtsp_port;
#endif
extern int audio_stream_cache;

View 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 ------------------------