diff options
| -rw-r--r-- | cfg-common.h | 14 | ||||
| -rw-r--r-- | cfg-mplayer.h | 15 |
2 files changed, 14 insertions, 15 deletions
diff --git a/cfg-common.h b/cfg-common.h index a2f54ddda4..a32d626011 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -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; diff --git a/cfg-mplayer.h b/cfg-mplayer.h index ce535d0194..2f656a5ed4 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -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 ------------------------ |