Mercurial > libavformat.hg

diff Makefile @ 1482:617beb4c6247 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add libnut support until ffmpeg gets an independant and complete de/muxer for NUT
author ods15
date Sun, 12 Nov 2006 06:09:15 +0000
parents 56fe078ffc27
children f1b6a9a50eec
line wrap: on
line diff
--- a/Makefile	Sat Nov 11 20:56:36 2006 +0000
+++ b/Makefile	Sun Nov 12 06:09:15 2006 +0000
@@ -73,8 +73,6 @@
 OBJS-$(CONFIG_MPJPEG_MUXER)              += mpjpeg.o
 OBJS-$(CONFIG_MXF_DEMUXER)               += mxf.o
 OBJS-$(CONFIG_NSV_DEMUXER)               += nsvdec.o riff.o
-OBJS-$(CONFIG_NUT_DEMUXER)               += nutdec.o riff.o
-#OBJS-$(CONFIG_NUT_MUXER)                 += nutenc.o riff.o
 OBJS-$(CONFIG_NUV_DEMUXER)               += nuv.o riff.o
 OBJS-$(CONFIG_OGG_DEMUXER)               += ogg2.o           \
                                             oggparsevorbis.o \
@@ -176,6 +174,14 @@
 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_NUT_DEMUXER)               += nutdec.o riff.o
+#OBJS-$(CONFIG_NUT_MUXER)                 += nutenc.o riff.o
+endif
+
 ifeq ($(CONFIG_LIBOGG),yes)
 OBJS-$(CONFIG_OGG_MUXER)                 += ogg.o
 endif