[MPlayer-cvslog] CVS: main cfg-common.h, 1.159, 1.160 cfg-mplayer.h, 1.261, 1.262
Reimar Döffinger CVS
syncmail at mplayerhq.hu
Tue Apr 18 13:06:37 CEST 2006
CVS change done by Reimar Döffinger CVS
Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv12298
Modified Files:
cfg-common.h cfg-mplayer.h
Log Message:
rtsp options should be available for mencoder as well
Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- cfg-common.h 26 Mar 2006 11:09:17 -0000 1.159
+++ cfg-common.h 18 Apr 2006 11:06:35 -0000 1.160
@@ -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;
Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- cfg-mplayer.h 16 Apr 2006 13:38:27 -0000 1.261
+++ cfg-mplayer.h 18 Apr 2006 11:06:35 -0000 1.262
@@ -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 ------------------------
More information about the MPlayer-cvslog
mailing list