diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-02-09 08:28:47 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-02-09 08:28:47 +0000 |
| commit | d7c592475de81d2129ece1017d7bc8f293b46160 (patch) | |
| tree | c9ba06c8bf056a28ba893fd21162de79ce81e7bf /libavformat/Makefile | |
| parent | 04cfef21ff25e30005d3b2a42bc145324e580a2f (diff) | |
Properly separate native and libnut NUT (de)muxers.
Originally committed as revision 7891 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 3f338c7647..2c2316daa2 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -165,13 +165,11 @@ OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o mpegts.o base64.o rtp_h264.o 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) |