summaryrefslogtreecommitdiffstats
path: root/cfg-common.h
diff options
context:
space:
mode:
authorben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-06-26 21:27:57 +0000
committerben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-06-26 21:27:57 +0000
commit054b52cb01a860a6179f150da5418cea7312813e (patch)
tree5658693c49ad4a07353663e417717d908d966aba /cfg-common.h
parent82853d7abdc27285298f06fb40ad1478052e7d72 (diff)
downloadmpv-054b52cb01a860a6179f150da5418cea7312813e.tar.bz2
mpv-054b52cb01a860a6179f150da5418cea7312813e.tar.xz
added new native rtsp demuxer code for mpeg-ts over rtp (now both real and non-real servers should be handled)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18833 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-common.h')
-rw-r--r--cfg-common.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/cfg-common.h b/cfg-common.h
index c03502e032..e01cb9674d 100644
--- a/cfg-common.h
+++ b/cfg-common.h
@@ -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 @@ extern int flip_hebrew;
#ifdef STREAMING_LIVE555
extern int rtspStreamOverTCP;
-extern int rtsp_port;
#endif
+extern int rtsp_port;
extern int audio_stream_cache;