Version bump, atrac3 added.

[ffmpeg] / libavcodec / Makefile

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 175755eb908583cee8233f5b3deaeb785efed57f..6345f64a49708e2469fe1199852be463606cf751 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -4,7 +4,7 @@
 #
 include ../config.mak
 
-CFLAGS+=-I$(SRC_PATH)/libswscale $(AMR_CFLAGS)
+CFLAGS+=-I$(SRC_PATH)/libswscale
 
 OBJS= bitstream.o \
       utils.o \
@@ -53,7 +53,9 @@ OBJS-$(CONFIG_ASV1_DECODER)            += asv1.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
@@ -250,6 +252,7 @@ OBJS-$(CONFIG_ADPCM_SBPRO_4_DECODER)   += adpcm.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
@@ -268,36 +271,14 @@ OBJS-$(CONFIG_X264)                    += x264.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
@@ -388,6 +369,7 @@ OBJS-$(TARGET_ALTIVEC)                 += ppc/dsputil_altivec.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
@@ -430,10 +412,8 @@ clean::
           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)