[Ffmpeg-cvslog] r7891 - in trunk: configure libavformat/Makefile libavformat/allformats.c libavformat/allformats.h libavformat/libnut.c

[diego]

Author: diego
Date: Fri Feb  9 09:28:47 2007
New Revision: 7891

Modified:
   trunk/configure
   trunk/libavformat/Makefile
   trunk/libavformat/allformats.c
   trunk/libavformat/allformats.h
   trunk/libavformat/libnut.c

Log:
Properly separate native and libnut NUT (de)muxers.


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Fri Feb  9 09:28:47 2007
@@ -562,7 +562,8 @@
 dc1394_demuxer_deps="dc1394"
 dv1394_demuxer_deps="dv1394"
 gxf_muxer_deps="gpl"
-nut_muxer_deps="libnut"
+libnut_demuxer_deps="libnut"
+libnut_muxer_deps="libnut"
 ogg_muxer_deps="libogg"
 redir_demuxer_deps="network"
 rtp_muxer_deps="network"

Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile	(original)
+++ trunk/libavformat/Makefile	Fri Feb  9 09:28:47 2007
@@ -165,13 +165,11 @@
 endif
 endif
 
-ifeq ($(CONFIG_LIBNUT),yes)
-OBJS-$(CONFIG_NUT_DEMUXER)               += libnut.o riff.o
-OBJS-$(CONFIG_NUT_MUXER)                 += libnut.o riff.o
-else
+OBJS-$(CONFIG_LIBNUT_DEMUXER)            += libnut.o riff.o
+OBJS-$(CONFIG_LIBNUT_MUXER)              += libnut.o riff.o
+
 OBJS-$(CONFIG_NUT_DEMUXER)               += nutdec.o riff.o
 #OBJS-$(CONFIG_NUT_MUXER)                 += nutenc.o riff.o
-endif
 
 NAME=avformat
 ifeq ($(BUILD_SHARED),yes)

Modified: trunk/libavformat/allformats.c
==============================================================================
--- trunk/libavformat/allformats.c	(original)
+++ trunk/libavformat/allformats.c	Fri Feb  9 09:28:47 2007
@@ -83,6 +83,8 @@
     REGISTER_MUXDEMUX(IMAGE2PIPE, image2pipe);
     REGISTER_DEMUXER (INGENIENT, ingenient);
     REGISTER_DEMUXER (IPMOVIE, ipmovie);
+    if (!ENABLE_NUT_DEMUXER) REGISTER_DEMUXER (LIBNUT, libnut);
+    REGISTER_MUXER   (LIBNUT, libnut);
     REGISTER_MUXDEMUX(M4V, m4v);
     REGISTER_DEMUXER (MATROSKA, matroska);
     REGISTER_MUXDEMUX(MJPEG, mjpeg);
@@ -109,7 +111,6 @@
     REGISTER_DEMUXER (NSV, nsv);
     REGISTER_MUXER   (NULL, null);
     REGISTER_DEMUXER (NUT, nut);
-    REGISTER_MUXER   (NUT, nut);
     REGISTER_DEMUXER (NUV, nuv);
     REGISTER_DEMUXER (OGG, ogg);
     REGISTER_MUXER   (OGG, ogg);

Modified: trunk/libavformat/allformats.h
==============================================================================
--- trunk/libavformat/allformats.h	(original)
+++ trunk/libavformat/allformats.h	Fri Feb  9 09:28:47 2007
@@ -69,6 +69,8 @@
 extern AVOutputFormat image_muxer;
 extern AVOutputFormat imagepipe_muxer;
 extern AVInputFormat ipmovie_demuxer;
+extern AVInputFormat libnut_demuxer;
+extern AVOutputFormat libnut_muxer;
 extern AVInputFormat matroska_demuxer;
 extern AVInputFormat mm_demuxer;
 extern AVInputFormat mmf_demuxer;
@@ -96,7 +98,6 @@
 extern AVInputFormat mxf_demuxer;
 extern AVInputFormat nsv_demuxer;
 extern AVInputFormat nut_demuxer;
-extern AVOutputFormat nut_muxer;
 extern AVInputFormat nuv_demuxer;
 extern AVInputFormat ogg_demuxer;
 extern AVOutputFormat ogg_muxer;

Modified: trunk/libavformat/libnut.c
==============================================================================
--- trunk/libavformat/libnut.c	(original)
+++ trunk/libavformat/libnut.c	Fri Feb  9 09:28:47 2007
@@ -123,7 +123,7 @@
     return 0;
 }
 
-AVOutputFormat nut_muxer = {
+AVOutputFormat libnut_muxer = {
     "nut",
     "nut format",
     "video/x-nut",
@@ -270,7 +270,7 @@
     return 0;
 }
 
-AVInputFormat nut_demuxer = {
+AVInputFormat libnut_demuxer = {
     "nut",
     "nut format",
     sizeof(NUTContext),