Mercurial > libavformat.hg
comparison Makefile @ 1769:35cf5d513830 libavformat
Properly separate native and libnut NUT (de)muxers.
author | diego |
---|---|
date | Fri, 09 Feb 2007 08:28:47 +0000 |
parents | 7b3d05ca0d5a |
children | 1c9232448d9f |
comparison
equal
deleted
inserted
replaced
1768:7598146fe1cc | 1769:35cf5d513830 |
---|---|
163 ifeq ($(CONFIG_NETWORK),yes) | 163 ifeq ($(CONFIG_NETWORK),yes) |
164 OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o mpegts.o base64.o rtp_h264.o | 164 OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o mpegts.o base64.o rtp_h264.o |
165 endif | 165 endif |
166 endif | 166 endif |
167 | 167 |
168 ifeq ($(CONFIG_LIBNUT),yes) | 168 OBJS-$(CONFIG_LIBNUT_DEMUXER) += libnut.o riff.o |
169 OBJS-$(CONFIG_NUT_DEMUXER) += libnut.o riff.o | 169 OBJS-$(CONFIG_LIBNUT_MUXER) += libnut.o riff.o |
170 OBJS-$(CONFIG_NUT_MUXER) += libnut.o riff.o | 170 |
171 else | |
172 OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o riff.o | 171 OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o riff.o |
173 #OBJS-$(CONFIG_NUT_MUXER) += nutenc.o riff.o | 172 #OBJS-$(CONFIG_NUT_MUXER) += nutenc.o riff.o |
174 endif | |
175 | 173 |
176 NAME=avformat | 174 NAME=avformat |
177 ifeq ($(BUILD_SHARED),yes) | 175 ifeq ($(BUILD_SHARED),yes) |
178 LIBVERSION=$(LAVFVERSION) | 176 LIBVERSION=$(LAVFVERSION) |
179 LIBMAJOR=$(LAVFMAJOR) | 177 LIBMAJOR=$(LAVFMAJOR) |