[MPlayer-cvslog] r25294 - in trunk: libmpdemux/demux_nemesi.c libmpdemux/demuxer.c libmpdemux/demuxer.h stream/stream_nemesi.c

[lu_zero]

Author: lu_zero
Date: Tue Dec  4 14:05:25 2007
New Revision: 25294

Log:
Make libnemesi use specific struct and DEMUXER_TYPE

Modified:
   trunk/libmpdemux/demux_nemesi.c
   trunk/libmpdemux/demuxer.c
   trunk/libmpdemux/demuxer.h
   trunk/stream/stream_nemesi.c

Modified: trunk/libmpdemux/demux_nemesi.c
==============================================================================
--- trunk/libmpdemux/demux_nemesi.c	(original)
+++ trunk/libmpdemux/demux_nemesi.c	Tue Dec  4 14:05:25 2007
@@ -483,13 +483,13 @@ static int demux_rtp_control(struct demu
     }
 }
 
-demuxer_desc_t demuxer_desc_rtp = {
+demuxer_desc_t demuxer_desc_rtp_nemesi = {
   "libNemesi demuxer",
   "rtp",
   "",
   "Alessandro Molina",
   "requires libNemesi",
-  DEMUXER_TYPE_RTP,
+  DEMUXER_TYPE_RTP_NEMESI,
   0, // no autodetect
   NULL,
   demux_rtp_fill_buffer,

Modified: trunk/libmpdemux/demuxer.c
==============================================================================
--- trunk/libmpdemux/demuxer.c	(original)
+++ trunk/libmpdemux/demuxer.c	Tue Dec  4 14:05:25 2007
@@ -63,6 +63,7 @@ extern demuxer_desc_t demuxer_desc_audio
 extern demuxer_desc_t demuxer_desc_xmms;
 extern demuxer_desc_t demuxer_desc_mpeg_ty;
 extern demuxer_desc_t demuxer_desc_rtp;
+extern demuxer_desc_t demuxer_desc_rtp_nemesi;
 extern demuxer_desc_t demuxer_desc_lavf;
 extern demuxer_desc_t demuxer_desc_lavf_preferred;
 extern demuxer_desc_t demuxer_desc_aac;
@@ -116,9 +117,12 @@ demuxer_desc_t* demuxer_list[] = {
 #endif
   &demuxer_desc_audio,
   &demuxer_desc_mpeg_ty,
-#if defined(STREAMING_LIVE555) || defined(LIBNEMESI)
+#ifdef STREAMING_LIVE555
   &demuxer_desc_rtp,
 #endif
+#ifdef LIBNEMESI
+  &demuxer_desc_rtp_nemesi,
+#endif
 #ifdef USE_LIBAVFORMAT
   &demuxer_desc_lavf,
 #endif

Modified: trunk/libmpdemux/demuxer.h
==============================================================================
--- trunk/libmpdemux/demuxer.h	(original)
+++ trunk/libmpdemux/demuxer.h	Tue Dec  4 14:05:25 2007
@@ -56,11 +56,12 @@
 #define DEMUXER_TYPE_MPEG_GXF 42
 #define DEMUXER_TYPE_NUT 43
 #define DEMUXER_TYPE_LAVF_PREFERRED 44
+#define DEMUXER_TYPE_RTP_NEMESI 45
 
 // This should always match the higest demuxer type number.
 // Unless you want to disallow users to force the demuxer to some types
 #define DEMUXER_TYPE_MIN 0
-#define DEMUXER_TYPE_MAX 44
+#define DEMUXER_TYPE_MAX 45
 
 #define DEMUXER_TYPE_DEMUXERS (1<<16)
 // A virtual demuxer type for the network code

Modified: trunk/stream/stream_nemesi.c
==============================================================================
--- trunk/stream/stream_nemesi.c	(original)
+++ trunk/stream/stream_nemesi.c	Tue Dec  4 14:05:25 2007
@@ -59,7 +59,7 @@ static int rtsp_streaming_open (stream_t
     stream->streaming_ctrl->url = check4proxies(url);
     stream->streaming_ctrl->streaming_seek = rtsp_streaming_seek;
 
-    *file_format = DEMUXER_TYPE_RTP;
+    *file_format = DEMUXER_TYPE_RTP_NEMESI;
     stream->type = STREAMTYPE_STREAM;
     return STREAM_OK;
 }