diff options
| author | Måns Rullgård <mans@mansr.com> | 2006-07-12 16:49:14 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2006-07-12 16:49:14 +0000 |
| commit | 6636b7e8e32121eec732778cf58a81574f618bb9 (patch) | |
| tree | d56cb6c34d42d1b86849465830d4adac33e573aa /libavcodec/Makefile | |
| parent | 8515d1c846c982daabb6199b4a794505c54aa0dc (diff) | |
rename AMR config variables to CONFIG_AMR*
Originally committed as revision 5725 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index d5568ce604..17c1680274 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -228,18 +228,18 @@ OBJS-$(CONFIG_AC3)$(CONFIG_A52BIN) += liba52/bit_allocate.o \ # currently using libdts for dts decoding OBJS-$(CONFIG_DTS) += dtsdec.o -OBJS-$(AMR) += amr.o -OBJS-$(AMR_NB) += amr_float/sp_dec.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 ($(AMR_NB_FIXED),yes) +ifeq ($(CONFIG_AMR_NB_FIXED),yes) EXTRAOBJS += amr/*.o EXTRADEPS=amrlibs endif -OBJS-$(AMR_WB) += amrwb_float/dec_acelp.o \ +OBJS-$(CONFIG_AMR_WB) += amrwb_float/dec_acelp.o \ amrwb_float/dec_dtx.o \ amrwb_float/dec_gain.o \ amrwb_float/dec_if.o \ |