diff options
author | Josh Varner <jlvarner@gmail.com> | 2005-02-21 17:50:48 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2005-02-21 17:50:48 +0000 |
commit | fe533bb3a7400399a927a6347bc21a8d7b6015a3 (patch) | |
tree | 1373a55c0e46b1a513b16d97f0718c330360da40 /libavcodec/Makefile | |
parent | 09f20d37867baaa0122ffdd75f0481b2b3a08079 (diff) |
removing --disable-risky patch by (Josh Varner <jlvarner gmail com>)
Originally committed as revision 3966 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r-- | libavcodec/Makefile | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index e95b888a34..3b424d8c09 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -21,7 +21,8 @@ OBJS= bitstream.o utils.o mem.o allcodecs.o \ msvideo1.o vqavideo.o idcinvideo.o adx.o rational.o faandct.o 8bps.o \ smc.o parser.o flicvideo.o truemotion1.o vmdav.o lcl.o qtrle.o g726.o \ flac.o vp3dsp.o integer.o snow.o tscc.o sonic.o ulti.o h264idct.o \ - qdrw.o xl.o rangecoder.o png.o pnm.o qpeg.o vc9.o + qdrw.o xl.o rangecoder.o png.o pnm.o qpeg.o vc9.o h263.o h261.o \ + msmpeg4.o h263dec.o svq1.o rv10.o wmadec.o indeo3.o AMROBJS= ifeq ($(AMR_NB),yes) @@ -62,11 +63,6 @@ OBJS+= $(AMROBJS) CLEANAMRWB=cleanamrwbfloat ASM_OBJS= -# codecs which are patented in some non free countries like the us -ifeq ($(CONFIG_RISKY),yes) -OBJS+= h263.o h261.o msmpeg4.o h263dec.o svq1.o rv10.o wmadec.o indeo3.o -endif - ifeq ($(HAVE_XVMC_ACCEL),yes) OBJS+= xvmcvideo.o endif |