[MPlayer-cvslog] r36455 - in trunk: cfg-common.h libmpdemux/demux_nemesi.c libmpdemux/demux_rtp.cpp libmpdemux/demuxer.c

[reimar]

Author: reimar
Date: Sat Sep 21 18:53:12 2013
New Revision: 36455

Log:
Move rtsp_transport_* variables to demuxer.c

Also make the corresponding command-line options always
available.
Most users will have some kind of rtsp support, possibly
through ffmpeg.
Putting it under CONFIG_NETWORKING would be more correct,
but doesn't seem worth the effort to me.

Modified:
   trunk/cfg-common.h
   trunk/libmpdemux/demux_nemesi.c
   trunk/libmpdemux/demux_rtp.cpp
   trunk/libmpdemux/demuxer.c

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	Sat Sep 21 18:39:24 2013	(r36454)
+++ trunk/cfg-common.h	Sat Sep 21 18:53:12 2013	(r36455)
@@ -380,21 +380,10 @@ const m_option_t common_opts[] = {
 
 #ifdef CONFIG_LIVE555
     {"sdp", "-sdp has been removed, use sdp://file instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
-    {"rtsp-stream-over-http", &rtsp_transport_http, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-#else
-    {"rtsp-stream-over-http", "-rtsp-stream-over-http requires the \"LIVE555 Streaming Media\" library.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif /* CONFIG_LIVE555 */
-#if defined(CONFIG_LIBNEMESI) || defined(CONFIG_LIVE555)
-    // -rtsp-stream-over-tcp option, specifying TCP streaming of RTP/RTCP
+    {"rtsp-stream-over-http", &rtsp_transport_http, CONF_TYPE_FLAG, 0, 0, 1, NULL},
     {"rtsp-stream-over-tcp", &rtsp_transport_tcp, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-#else
-    {"rtsp-stream-over-tcp", "-rtsp-stream-over-tcp requires the \"LIVE555 Streaming Media\" or \"libnemesi\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-#endif /* defined(CONFIG_LIBNEMESI) || defined(CONFIG_LIVE555) */
-#ifdef CONFIG_LIBNEMESI
     {"rtsp-stream-over-sctp", &rtsp_transport_sctp, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-#else
-    {"rtsp-stream-over-sctp", "-rtsp-stream-over-sctp requires the \"libnemesi\" library\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-#endif /* CONFIG_LIBNEMESI */
 #ifdef CONFIG_NETWORKING
     {"rtsp-port", &rtsp_port, CONF_TYPE_INT, CONF_RANGE, -1, 65535, NULL},
     {"rtsp-destination", &rtsp_destination, CONF_TYPE_STRING, CONF_MIN, 0, 0, NULL},

Modified: trunk/libmpdemux/demux_nemesi.c
==============================================================================
--- trunk/libmpdemux/demux_nemesi.c	Sat Sep 21 18:39:24 2013	(r36454)
+++ trunk/libmpdemux/demux_nemesi.c	Sat Sep 21 18:53:12 2013	(r36455)
@@ -30,9 +30,6 @@
 #include "nemesi/rtp.h"
 #include <sched.h>
 
-int rtsp_transport_http = 0;
-int rtsp_transport_tcp = 0;
-int rtsp_transport_sctp = 0;
 int rtsp_port = 0;
 
 typedef struct {

Modified: trunk/libmpdemux/demux_rtp.cpp
==============================================================================
--- trunk/libmpdemux/demux_rtp.cpp	Sat Sep 21 18:39:24 2013	(r36454)
+++ trunk/libmpdemux/demux_rtp.cpp	Sat Sep 21 18:53:12 2013	(r36455)
@@ -114,14 +114,6 @@ static char* openURL_sip(SIPClient* clie
   }
 }
 
-#ifdef CONFIG_LIBNEMESI
-extern int rtsp_transport_tcp;
-extern int rtsp_transport_http;
-#else
-int rtsp_transport_tcp = 0;
-int rtsp_transport_http = 0;
-#endif
-
 #ifdef CONFIG_FFMPEG
 extern AVCodecContext *avcctx;
 #endif

Modified: trunk/libmpdemux/demuxer.c
==============================================================================
--- trunk/libmpdemux/demuxer.c	Sat Sep 21 18:39:24 2013	(r36454)
+++ trunk/libmpdemux/demuxer.c	Sat Sep 21 18:53:12 2013	(r36455)
@@ -57,6 +57,11 @@
 #endif
 #include "libavutil/avstring.h"
 
+// Options shared between demuxers
+int rtsp_transport_http = 0;
+int rtsp_transport_tcp = 0;
+int rtsp_transport_sctp = 0;
+
 // This is quite experimental, in particular it will mess up the pts values
 // in the queue - on the other hand it might fix some issues like generating
 // broken files with mencoder and stream copy.