#
include ../config.mak
-CFLAGS+=-I$(SRC_PATH)/libswscale $(AMR_CFLAGS)
+CFLAGS+=-I$(SRC_PATH)/libswscale
OBJS= bitstream.o \
utils.o \
OBJS-$(CONFIG_ASV1_ENCODER) += asv1.o
OBJS-$(CONFIG_ASV2_DECODER) += asv1.o
OBJS-$(CONFIG_ASV2_ENCODER) += asv1.o
+OBJS-$(CONFIG_ATRAC3_DECODER) += atrac3.o
OBJS-$(CONFIG_AVS_DECODER) += avs.o
+OBJS-$(CONFIG_BETHSOFTVID_DECODER) += bethsoftvideo.o
OBJS-$(CONFIG_BMP_DECODER) += bmp.o
OBJS-$(CONFIG_BMP_ENCODER) += bmpenc.o
+OBJS-$(CONFIG_C93_DECODER) += c93.o
OBJS-$(CONFIG_CAVS_DECODER) += cavs.o cavsdsp.o
OBJS-$(CONFIG_CINEPAK_DECODER) += cinepak.o
OBJS-$(CONFIG_CLJR_DECODER) += cljr.o
OBJS-$(CONFIG_RV10_ENCODER) += rv10.o
OBJS-$(CONFIG_RV20_DECODER) += rv10.o
OBJS-$(CONFIG_RV20_ENCODER) += rv10.o
+OBJS-$(CONFIG_SGI_DECODER) += sgidec.o
+OBJS-$(CONFIG_SGI_ENCODER) += sgienc.o rle.o
OBJS-$(CONFIG_SHORTEN_DECODER) += shorten.o
OBJS-$(CONFIG_SMACKAUD_DECODER) += smacker.o
OBJS-$(CONFIG_SMACKER_DECODER) += smacker.o
OBJS-$(CONFIG_SVQ1_ENCODER) += svq1.o
OBJS-$(CONFIG_SVQ3_DECODER) += h264.o
OBJS-$(CONFIG_TARGA_DECODER) += targa.o
-OBJS-$(CONFIG_TARGA_ENCODER) += targaenc.o
-OBJS-$(CONFIG_THEORA_DECODER) += vp3.o
+OBJS-$(CONFIG_TARGA_ENCODER) += targaenc.o rle.o
+OBJS-$(CONFIG_THEORA_DECODER) += vp3.o xiph.o
OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.o
OBJS-$(CONFIG_TIFF_DECODER) += tiff.o lzw.o
+OBJS-$(CONFIG_TIFF_ENCODER) += tiffenc.o rle.o lzwenc.o
OBJS-$(CONFIG_TRUEMOTION1_DECODER) += truemotion1.o
OBJS-$(CONFIG_TRUEMOTION2_DECODER) += truemotion2.o
OBJS-$(CONFIG_TRUESPEECH_DECODER) += truespeech.o
OBJS-$(CONFIG_ADPCM_SBPRO_4_ENCODER) += adpcm.o
OBJS-$(CONFIG_ADPCM_SWF_DECODER) += adpcm.o
OBJS-$(CONFIG_ADPCM_SWF_ENCODER) += adpcm.o
+OBJS-$(CONFIG_ADPCM_THP_DECODER) += adpcm.o
OBJS-$(CONFIG_ADPCM_XA_DECODER) += adpcm.o
OBJS-$(CONFIG_ADPCM_XA_ENCODER) += adpcm.o
OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER) += adpcm.o
OBJS-$(CONFIG_XVID) += xvidff.o xvid_rc.o
OBJS-$(CONFIG_AMR) += amr.o
-OBJS-$(CONFIG_AMR_NB) += amr_float/sp_dec.o \
- amr_float/sp_enc.o \
- amr_float/interf_dec.o \
- amr_float/interf_enc.o
-
ifeq ($(CONFIG_AMR_NB_FIXED),yes)
EXTRAOBJS += amr/*.o
EXTRADEPS=amrlibs
endif
-OBJS-$(CONFIG_AMR_WB) += amrwb_float/dec_acelp.o \
- amrwb_float/dec_dtx.o \
- amrwb_float/dec_gain.o \
- amrwb_float/dec_if.o \
- amrwb_float/dec_lpc.o \
- amrwb_float/dec_main.o \
- amrwb_float/dec_rom.o \
- amrwb_float/dec_util.o \
- amrwb_float/enc_acelp.o \
- amrwb_float/enc_dtx.o \
- amrwb_float/enc_gain.o \
- amrwb_float/enc_if.o \
- amrwb_float/enc_lpc.o \
- amrwb_float/enc_main.o \
- amrwb_float/enc_rom.o \
- amrwb_float/enc_util.o \
- amrwb_float/if_rom.o
OBJS-$(CONFIG_AAC_PARSER) += parser.o
-OBJS-$(CONFIG_AC3_PARSER) += parser.o ac3.o
+OBJS-$(CONFIG_AC3_PARSER) += parser.o
OBJS-$(CONFIG_CAVSVIDEO_PARSER) += cavs.o parser.o
OBJS-$(CONFIG_DVBSUB_PARSER) += dvbsubdec.o
OBJS-$(CONFIG_DVDSUB_PARSER) += dvdsubdec.o
OBJS += imgresample.o
endif
-# i386 mmx specific stuff
+# processor-specific code
ifeq ($(TARGET_MMX),yes)
OBJS += i386/fdct_mmx.o \
i386/cputest.o \
OBJS-$(CONFIG_SNOW_DECODER) += i386/snowdsp_mmx.o
endif
-# armv4l specific stuff
ASM_OBJS-$(TARGET_ARCH_ARMV4L) += armv4l/jrevdct_arm.o \
armv4l/simple_idct_arm.o \
armv4l/dsputil_arm_s.o \
ASM_OBJS-$(HAVE_ARMV6) += armv4l/simple_idct_armv6.o
-# sun sparc
OBJS-$(TARGET_ARCH_SPARC) += sparc/dsputil_vis.o \
sparc/dsputil_vis.o: CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc
-# sun mediaLib specific stuff
OBJS-$(HAVE_MLIB) += mlib/dsputil_mlib.o \
-# alpha specific stuff
OBJS-$(TARGET_ARCH_ALPHA) += alpha/dsputil_alpha.o \
alpha/mpegvideo_alpha.o \
alpha/simple_idct_alpha.o \
ppc/gmc_altivec.o \
ppc/fdct_altivec.o \
ppc/float_altivec.o \
+ ppc/int_altivec.o \
ifeq ($(TARGET_ALTIVEC),yes)
OBJS-$(CONFIG_H264_DECODER) += ppc/h264_altivec.o
OBJS-$(TARGET_ARCH_BFIN) += bfin/dsputil_bfin.o \
+ASM_OBJS-$(TARGET_ARCH_BFIN) += bfin/pixels_bfin.o \
+ bfin/idct_bfin.o \
+ bfin/fdct_bfin.o \
+
EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
NAME=avcodec
LIBVERSION=$(LAVCVERSION)
LIBMAJOR=$(LAVCMAJOR)
-TESTS= imgresample-test fft-test
+TESTS= imgresample-test fft-test dct-test
ifeq ($(TARGET_ARCH_X86),yes)
-TESTS+= cpuid_test dct-test motion-test
+TESTS+= cpuid_test motion-test
endif
include ../common.mak
ps2/*.o ps2/*~ \
sh4/*.o sh4/*~ \
sparc/*.o sparc/*~ \
- amr_float/*.o \
apiexample $(TESTS)
-$(MAKE) -C amr clean
- -$(MAKE) -C amrwb_float -f makefile.gcc clean
apiexample: apiexample.o $(LIB)