Mercurial > mplayer.hg
changeset 18135:ebb9806d7dda
rtsp options should be available for mencoder as well
| author | reimar |
|---|---|
| date | Tue, 18 Apr 2006 11:06:35 +0000 |
| parents | 615c90c6a4e4 |
| children | 3dcb3aaeb7cb |
| files | cfg-common.h cfg-mplayer.h |
| diffstat | 2 files changed, 14 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- 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;
--- 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 ------------------------