[MPlayer-dev-eng] Add demux_nut to libmpdemux

[Oded Shimon]

Since libnut doesn't really have any installation method, I have nothing 
to add to MPlayer's configure.

However, can I commit this (harmless) patch together with demux_nut.c from 
nut repo?

No objections I'll commit tommorrow...

- ods15
-------------- next part --------------
Index: Makefile
===================================================================
--- Makefile	(revision 19814)
+++ Makefile	(working copy)
@@ -110,6 +110,7 @@
              $(X264_LIB) \
              $(MUSEPACK_LIB) \
              $(SPEEX_LIB) \
+             $(NUT_LIB) \
 
 ifeq ($(TOOLAME),yes)
 CODEC_LIBS += $(TOOLAME_LIB)
Index: libmpdemux/Makefile
===================================================================
--- libmpdemux/Makefile	(revision 19814)
+++ libmpdemux/Makefile	(working copy)
@@ -53,6 +53,9 @@
         demux_y4m.c \
         demux_mkv.c ebml.c \
 
+ifeq ($(LIBNUT),yes)
+SRCS += demux_nut.c
+endif
 ifeq ($(LIBVORBIS),yes)
 SRCS += demux_ogg.c
 endif
Index: libmpdemux/demuxer.c
===================================================================
--- libmpdemux/demuxer.c	(revision 19814)
+++ libmpdemux/demuxer.c	(working copy)
@@ -66,6 +66,7 @@
 extern demuxer_desc_t demuxer_desc_lavf;
 #endif
 extern demuxer_desc_t demuxer_desc_aac;
+extern demuxer_desc_t demuxer_desc_nut;
 
 demuxer_desc_t* demuxer_list[] = {
   &demuxer_desc_rawaudio,
@@ -120,6 +121,9 @@
   &demuxer_desc_rawdv,
 #endif
   &demuxer_desc_aac,
+#ifdef HAVE_LIBNUT
+  &demuxer_desc_nut,
+#endif
 #ifdef HAVE_XMMS
   &demuxer_desc_xmms,
 #endif
Index: libmpdemux/demuxer.h
===================================================================
--- libmpdemux/demuxer.h	(revision 19814)
+++ libmpdemux/demuxer.h	(working copy)
@@ -54,11 +54,12 @@
 #define DEMUXER_TYPE_MPC 40
 #define DEMUXER_TYPE_MPEG_PES 41
 #define DEMUXER_TYPE_MPEG_GXF 42
+#define DEMUXER_TYPE_NUT 43
 
 // 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 42
+#define DEMUXER_TYPE_MAX 43
 
 #define DEMUXER_TYPE_DEMUXERS (1<<16)
 // A virtual demuxer type for the network code
-------------- next part --------------
A non-text attachment was scrubbed...
Name: demux_nut.c
Type: text/x-csrc
Size: 7947 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20060915/7feffe9a/attachment.c>