diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2003-01-29 12:00:11 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2003-01-29 12:00:11 +0000 |
commit | 1d0d55daf48a806561ebe3e9f61f62c3f7b93b9d (patch) | |
tree | 8ea5db552c5461da4de8db652dc3a8ad01351eda /libavcodec/Makefile | |
parent | 02d697aa5f1afb7d74fee87183d56b9c8764da7c (diff) | |
download | ffmpeg-1d0d55daf48a806561ebe3e9f61f62c3f7b93b9d.tar.gz |
--disable-risky support
Originally committed as revision 1522 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r-- | libavcodec/Makefile | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 45429dfac3..368d967c91 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -11,14 +11,19 @@ CFLAGS= $(OPTFLAGS) -Wall -g -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_L LDFLAGS= -g OBJS= common.o utils.o mem.o allcodecs.o \ - mpegvideo.o h263.o jrevdct.o jfdctfst.o jfdctint.o\ + mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\ mpegaudio.o ac3enc.o mjpeg.o resample.o dsputil.o \ - motion_est.o imgconvert.o imgresample.o msmpeg4.o \ - mpeg12.o h263dec.o svq1.o rv10.o mpegaudiodec.o pcm.o simple_idct.o \ + motion_est.o imgconvert.o imgresample.o \ + mpeg12.o mpegaudiodec.o pcm.o simple_idct.o \ ratecontrol.o adpcm.o eval.o dv.o error_resilience.o \ - wmadec.o fft.o mdct.o mace.o huffyuv.o + fft.o mdct.o mace.o huffyuv.o ASM_OBJS= +# codecs which are patented in some non free countries like the us +ifeq ($(CONFIG_RISKY),yes) +OBJS+= h263.o msmpeg4.o h263dec.o svq1.o rv10.o wmadec.o +endif + # currently using liba52 for ac3 decoding ifeq ($(CONFIG_AC3),yes) OBJS+= a52dec.o |