Mercurial > mplayer.hg
changeset 25266:239330301b33
Make libnemesi use specific struct and DEMUXER_TYPE
| author | lu_zero |
|---|---|
| date | Tue, 04 Dec 2007 13:05:25 +0000 |
| parents | 7055944e3ce9 |
| children | f7fa01fe18c8 |
| files | libmpdemux/demux_nemesi.c libmpdemux/demuxer.c libmpdemux/demuxer.h stream/stream_nemesi.c |
| diffstat | 4 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demux_nemesi.c Tue Dec 04 12:38:31 2007 +0000 +++ b/libmpdemux/demux_nemesi.c Tue Dec 04 13:05:25 2007 +0000 @@ -483,13 +483,13 @@ } } -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,
--- a/libmpdemux/demuxer.c Tue Dec 04 12:38:31 2007 +0000 +++ b/libmpdemux/demuxer.c Tue Dec 04 13:05:25 2007 +0000 @@ -63,6 +63,7 @@ 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 @@ #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
--- a/libmpdemux/demuxer.h Tue Dec 04 12:38:31 2007 +0000 +++ b/libmpdemux/demuxer.h Tue Dec 04 13:05:25 2007 +0000 @@ -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
--- a/stream/stream_nemesi.c Tue Dec 04 12:38:31 2007 +0000 +++ b/stream/stream_nemesi.c Tue Dec 04 13:05:25 2007 +0000 @@ -59,7 +59,7 @@ 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; }