# HG changeset patch # User diego # Date 1171009851 0 # Node ID 1c9232448d9f57758943bb3daa88ded8ffdb3e21 # Parent 35cf5d5138308fa245c17871a99298f092ea0fe8 cosmetics: Reorder NUT entries. diff -r 35cf5d513830 -r 1c9232448d9f Makefile --- a/Makefile Fri Feb 09 08:28:47 2007 +0000 +++ b/Makefile Fri Feb 09 08:30:51 2007 +0000 @@ -110,6 +110,8 @@ OBJS-$(CONFIG_RAWVIDEO_DEMUXER) += raw.o OBJS-$(CONFIG_RAWVIDEO_MUXER) += raw.o OBJS-$(CONFIG_NULL_MUXER) += raw.o +OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o riff.o +#OBJS-$(CONFIG_NUT_MUXER) += nutenc.o riff.o OBJS-$(CONFIG_RM_DEMUXER) += rm.o OBJS-$(CONFIG_RM_MUXER) += rm.o OBJS-$(CONFIG_SEGAFILM_DEMUXER) += segafilm.o @@ -133,6 +135,10 @@ OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg.o OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER) += yuv4mpeg.o +# external libraries +OBJS-$(CONFIG_LIBNUT_DEMUXER) += libnut.o riff.o +OBJS-$(CONFIG_LIBNUT_MUXER) += libnut.o riff.o + OBJS+= framehook.o ifeq ($(CONFIG_VIDEO4LINUX),yes) @@ -165,12 +171,6 @@ endif endif -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 - NAME=avformat ifeq ($(BUILD_SHARED),yes) LIBVERSION=$(LAVFVERSION)