diff options
| author | lu_zero <lu_zero@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-12-04 13:05:25 +0000 |
|---|---|---|
| committer | lu_zero <lu_zero@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-12-04 13:05:25 +0000 |
| commit | a1fe08b75015e69d62c9e30b8b8b93e17037c2b7 (patch) | |
| tree | f7f14fc96a1b17b893155194e54ed9dde634a688 | |
| parent | 16cd94eb812a2e79777a96e108abc5db525b70de (diff) | |
| download | mpv-a1fe08b75015e69d62c9e30b8b8b93e17037c2b7.tar.bz2 mpv-a1fe08b75015e69d62c9e30b8b8b93e17037c2b7.tar.xz | |
Make libnemesi use specific struct and DEMUXER_TYPE
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25294 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libmpdemux/demux_nemesi.c | 4 | ||||
| -rw-r--r-- | libmpdemux/demuxer.c | 6 | ||||
| -rw-r--r-- | libmpdemux/demuxer.h | 3 | ||||
| -rw-r--r-- | stream/stream_nemesi.c | 2 |
4 files changed, 10 insertions, 5 deletions
diff --git a/libmpdemux/demux_nemesi.c b/libmpdemux/demux_nemesi.c index 2f337c099c..1af3bb4f86 100644 --- a/libmpdemux/demux_nemesi.c +++ b/libmpdemux/demux_nemesi.c @@ -483,13 +483,13 @@ static int demux_rtp_control(struct demuxer_st *demuxer, int cmd, void *arg) } } -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, diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 90fc4b9296..585ae938ea 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -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 diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index ecba6b71ca..fc6fa4df07 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -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 diff --git a/stream/stream_nemesi.c b/stream/stream_nemesi.c index e008035be5..be72f6ae00 100644 --- a/stream/stream_nemesi.c +++ b/stream/stream_nemesi.c @@ -59,7 +59,7 @@ static int rtsp_streaming_open (stream_t *stream, int mode, void *opts, 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; } |