summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
diff options
context:
space:
mode:
authorlu_zero <lu_zero@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-12-04 13:05:25 +0000
committerlu_zero <lu_zero@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-12-04 13:05:25 +0000
commita1fe08b75015e69d62c9e30b8b8b93e17037c2b7 (patch)
treef7f14fc96a1b17b893155194e54ed9dde634a688 /libmpdemux/demuxer.c
parent16cd94eb812a2e79777a96e108abc5db525b70de (diff)
downloadmpv-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
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r--libmpdemux/demuxer.c6
1 files changed, 5 insertions, 1 deletions
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