comparison Makefile @ 678:9b2cda2905cc libavformat

removing --disable-risky patch by (Josh Varner <jlvarner gmail com>)
author michael
date Mon, 21 Feb 2005 17:50:48 +0000
parents 868c41d335aa
children decfffe703bc
comparison
equal deleted inserted replaced
677:6d6a11ba402a 678:9b2cda2905cc
14 # mux and demuxes 14 # mux and demuxes
15 OBJS+=mpeg.o mpegts.o mpegtsenc.o ffm.o crc.o img.o img2.o raw.o rm.o \ 15 OBJS+=mpeg.o mpegts.o mpegtsenc.o ffm.o crc.o img.o img2.o raw.o rm.o \
16 avienc.o avidec.o wav.o swf.o au.o gif.o mov.o mpjpeg.o dv.o \ 16 avienc.o avidec.o wav.o swf.o au.o gif.o mov.o mpjpeg.o dv.o \
17 yuv4mpeg.o 4xm.o flvenc.o flvdec.o movenc.o psxstr.o idroq.o ipmovie.o \ 17 yuv4mpeg.o 4xm.o flvenc.o flvdec.o movenc.o psxstr.o idroq.o ipmovie.o \
18 nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o \ 18 nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o \
19 sierravmd.o matroska.o sol.o electronicarts.o nsvdec.o 19 sierravmd.o matroska.o sol.o electronicarts.o nsvdec.o asf.o asf-enc.o
20
21 ifeq ($(CONFIG_RISKY),yes)
22 OBJS+= asf.o
23 OBJS+= asf-enc.o
24 endif
25 20
26 AMROBJS= 21 AMROBJS=
27 ifeq ($(AMR_NB),yes) 22 ifeq ($(AMR_NB),yes)
28 AMROBJS= amr.o 23 AMROBJS= amr.o
29 endif 24 endif