Mercurial > libavformat.hg

changeset 1769:35cf5d513830 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Properly separate native and libnut NUT (de)muxers.
author diego
date Fri, 09 Feb 2007 08:28:47 +0000
parents 7598146fe1cc
children 1c9232448d9f
files Makefile allformats.c allformats.h libnut.c
diffstat 4 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Thu Feb 08 23:41:08 2007 +0000
+++ b/Makefile	Fri Feb 09 08:28:47 2007 +0000
@@ -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)
--- a/allformats.c	Thu Feb 08 23:41:08 2007 +0000
+++ b/allformats.c	Fri Feb 09 08:28:47 2007 +0000
@@ -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);
--- a/allformats.h	Thu Feb 08 23:41:08 2007 +0000
+++ b/allformats.h	Fri Feb 09 08:28:47 2007 +0000
@@ -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;
--- a/libnut.c	Thu Feb 08 23:41:08 2007 +0000
+++ b/libnut.c	Fri Feb 09 08:28:47 2007 +0000
@@ -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),