comparison 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
comparison
equal deleted inserted replaced
2513:ab32402c7e09 2514:fc23a5a86d97
19 vp3.o asv1.o 4xm.o cabac.o ffv1.o ra144.o ra288.o vcr1.o cljr.o \ 19 vp3.o asv1.o 4xm.o cabac.o ffv1.o ra144.o ra288.o vcr1.o cljr.o \
20 roqvideo.o dpcm.o interplayvideo.o xan.o rpza.o cinepak.o msrle.o \ 20 roqvideo.o dpcm.o interplayvideo.o xan.o rpza.o cinepak.o msrle.o \
21 msvideo1.o vqavideo.o idcinvideo.o adx.o rational.o faandct.o 8bps.o \ 21 msvideo1.o vqavideo.o idcinvideo.o adx.o rational.o faandct.o 8bps.o \
22 smc.o parser.o flicvideo.o truemotion1.o vmdav.o lcl.o qtrle.o g726.o \ 22 smc.o parser.o flicvideo.o truemotion1.o vmdav.o lcl.o qtrle.o g726.o \
23 flac.o vp3dsp.o integer.o snow.o tscc.o sonic.o ulti.o h264idct.o \ 23 flac.o vp3dsp.o integer.o snow.o tscc.o sonic.o ulti.o h264idct.o \
24 qdrw.o xl.o rangecoder.o png.o pnm.o qpeg.o vc9.o 24 qdrw.o xl.o rangecoder.o png.o pnm.o qpeg.o vc9.o h263.o h261.o \
25 msmpeg4.o h263dec.o svq1.o rv10.o wmadec.o indeo3.o
25 26
26 AMROBJS= 27 AMROBJS=
27 ifeq ($(AMR_NB),yes) 28 ifeq ($(AMR_NB),yes)
28 ifeq ($(AMR_NB_FIXED),yes) 29 ifeq ($(AMR_NB_FIXED),yes)
29 AMROBJS= amr.o 30 AMROBJS= amr.o
59 amrwb_float/enc_util.o amrwb_float/if_rom.o 60 amrwb_float/enc_util.o amrwb_float/if_rom.o
60 endif 61 endif
61 OBJS+= $(AMROBJS) 62 OBJS+= $(AMROBJS)
62 CLEANAMRWB=cleanamrwbfloat 63 CLEANAMRWB=cleanamrwbfloat
63 ASM_OBJS= 64 ASM_OBJS=
64
65 # codecs which are patented in some non free countries like the us
66 ifeq ($(CONFIG_RISKY),yes)
67 OBJS+= h263.o h261.o msmpeg4.o h263dec.o svq1.o rv10.o wmadec.o indeo3.o
68 endif
69 65
70 ifeq ($(HAVE_XVMC_ACCEL),yes) 66 ifeq ($(HAVE_XVMC_ACCEL),yes)
71 OBJS+= xvmcvideo.o 67 OBJS+= xvmcvideo.o
72 endif 68 endif
73 69