diff Makefile @ 2514:fc23a5a86d97 libavcodec

removing --disable-risky patch by (Josh Varner <jlvarner gmail com>)
author michael
date Mon, 21 Feb 2005 17:50:48 +0000
parents 96da66323faa
children 047f7bad4cbb
line wrap: on
line diff
--- a/Makefile	Sun Feb 20 23:21:50 2005 +0000
+++ b/Makefile	Mon Feb 21 17:50:48 2005 +0000
@@ -21,7 +21,8 @@
       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 @@
 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