comparison Makefile @ 1482:617beb4c6247 libavformat

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
comparison
equal deleted inserted replaced
1481:08322a7e3804 1482:617beb4c6247
71 OBJS-$(CONFIG_MPEGTS_DEMUXER) += mpegts.o 71 OBJS-$(CONFIG_MPEGTS_DEMUXER) += mpegts.o
72 OBJS-$(CONFIG_MPEGTS_MUXER) += mpegtsenc.o 72 OBJS-$(CONFIG_MPEGTS_MUXER) += mpegtsenc.o
73 OBJS-$(CONFIG_MPJPEG_MUXER) += mpjpeg.o 73 OBJS-$(CONFIG_MPJPEG_MUXER) += mpjpeg.o
74 OBJS-$(CONFIG_MXF_DEMUXER) += mxf.o 74 OBJS-$(CONFIG_MXF_DEMUXER) += mxf.o
75 OBJS-$(CONFIG_NSV_DEMUXER) += nsvdec.o riff.o 75 OBJS-$(CONFIG_NSV_DEMUXER) += nsvdec.o riff.o
76 OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o riff.o
77 #OBJS-$(CONFIG_NUT_MUXER) += nutenc.o riff.o
78 OBJS-$(CONFIG_NUV_DEMUXER) += nuv.o riff.o 76 OBJS-$(CONFIG_NUV_DEMUXER) += nuv.o riff.o
79 OBJS-$(CONFIG_OGG_DEMUXER) += ogg2.o \ 77 OBJS-$(CONFIG_OGG_DEMUXER) += ogg2.o \
80 oggparsevorbis.o \ 78 oggparsevorbis.o \
81 oggparsetheora.o \ 79 oggparsetheora.o \
82 oggparseflac.o \ 80 oggparseflac.o \
174 OBJS+= barpainet.o 172 OBJS+= barpainet.o
175 endif 173 endif
176 endif 174 endif
177 endif 175 endif
178 176
177 ifeq ($(CONFIG_LIBNUT),yes)
178 OBJS-$(CONFIG_NUT_DEMUXER) += libnut.o riff.o
179 OBJS-$(CONFIG_NUT_MUXER) += libnut.o riff.o
180 else
181 OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o riff.o
182 #OBJS-$(CONFIG_NUT_MUXER) += nutenc.o riff.o
183 endif
184
179 ifeq ($(CONFIG_LIBOGG),yes) 185 ifeq ($(CONFIG_LIBOGG),yes)
180 OBJS-$(CONFIG_OGG_MUXER) += ogg.o 186 OBJS-$(CONFIG_OGG_MUXER) += ogg.o
181 endif 187 endif
182 188
183 ifeq ($(CONFIG_GPL),yes) 189 ifeq ($(CONFIG_GPL),yes)