Mercurial > mplayer.hg
diff cfg-common.h @ 18829:317e0fd394c5
added new native rtsp demuxer code for mpeg-ts over rtp (now both real and non-real servers should be handled)
author | ben |
---|---|
date | Mon, 26 Jun 2006 21:27:57 +0000 |
parents | b3fa3772a187 |
children | 57bb217e71a4 |
line wrap: on
line diff
--- a/cfg-common.h Mon Jun 26 19:04:59 2006 +0000 +++ b/cfg-common.h Mon Jun 26 21:27:57 2006 +0000 @@ -70,12 +70,11 @@ {"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 - + {"rtsp-port", &rtsp_port, CONF_TYPE_INT, CONF_RANGE, -1, 65535, NULL}, + // ------------------------- demuxer options -------------------- // number of frames to play/convert @@ -415,8 +414,8 @@ #ifdef STREAMING_LIVE555 extern int rtspStreamOverTCP; +#endif extern int rtsp_port; -#endif extern int audio_stream_cache;