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 | |
| parent | 8515d1c846c982daabb6199b4a794505c54aa0dc (diff) | |
| download | ffmpeg-6636b7e8e32121eec732778cf58a81574f618bb9.tar.gz | |
rename AMR config variables to CONFIG_AMR*
Originally committed as revision 5725 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 8 | ||||
| -rw-r--r-- | libavcodec/allcodecs.c | 8 | ||||
| -rw-r--r-- | libavcodec/amr.c | 12 |
3 files changed, 14 insertions, 14 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 \ diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 172193fc1d..c87b5973df 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -540,7 +540,7 @@ void avcodec_register_all(void) #endif //CONFIG_FLASHSV_DECODER #endif /* CONFIG_DECODERS */ -#if defined(AMR_NB) || defined(AMR_NB_FIXED) +#if defined(CONFIG_AMR_NB) || defined(CONFIG_AMR_NB_FIXED) #ifdef CONFIG_AMR_NB_DECODER register_avcodec(&amr_nb_decoder); #endif //CONFIG_AMR_NB_DECODER @@ -549,9 +549,9 @@ void avcodec_register_all(void) register_avcodec(&amr_nb_encoder); #endif //CONFIG_AMR_NB_ENCODER #endif //CONFIG_ENCODERS -#endif /* AMR_NB || AMR_NB_FIXED */ +#endif /* CONFIG_AMR_NB || CONFIG_AMR_NB_FIXED */ -#ifdef AMR_WB +#ifdef CONFIG_AMR_WB #ifdef CONFIG_AMR_WB_DECODER register_avcodec(&amr_wb_decoder); #endif //CONFIG_AMR_WB_DECODER @@ -560,7 +560,7 @@ void avcodec_register_all(void) register_avcodec(&amr_wb_encoder); #endif //CONFIG_AMR_WB_ENCODER #endif //CONFIG_ENCODERS -#endif /* AMR_WB */ +#endif /* CONFIG_AMR_WB */ #ifdef CONFIG_BMP_DECODER register_avcodec(&bmp_decoder); diff --git a/libavcodec/amr.c b/libavcodec/amr.c index 6a354130c3..a3f4e79fa4 100644 --- a/libavcodec/amr.c +++ b/libavcodec/amr.c @@ -55,7 +55,7 @@ #include "avcodec.h" -#ifdef AMR_NB_FIXED +#ifdef CONFIG_AMR_NB_FIXED #define MMS_IO @@ -107,7 +107,7 @@ static enum Mode getBitrateMode(int bitrate) return(MR122); } -#ifdef AMR_NB_FIXED +#ifdef CONFIG_AMR_NB_FIXED /* fixed point version*/ /* frame size in serial bitstream file (frame type + serial stream + flags) */ #define SERIAL_FRAMESIZE (1+MAX_SERIAL_SIZE+5) @@ -326,7 +326,7 @@ static int amr_nb_encode_frame(AVCodecContext *avctx, } -#elif defined(AMR_NB) /* Float point version*/ +#elif defined(CONFIG_AMR_NB) /* Float point version*/ typedef struct AMRContext { int frameCount; @@ -457,7 +457,7 @@ static int amr_nb_encode_frame(AVCodecContext *avctx, #endif -#if defined(AMR_NB) || defined(AMR_NB_FIXED) +#if defined(CONFIG_AMR_NB) || defined(CONFIG_AMR_NB_FIXED) AVCodec amr_nb_decoder = { @@ -486,7 +486,7 @@ AVCodec amr_nb_encoder = #endif /* -----------AMR wideband ------------*/ -#ifdef AMR_WB +#ifdef CONFIG_AMR_WB #ifdef _TYPEDEF_H //To avoid duplicate typedefs from typdef in amr-nb @@ -661,4 +661,4 @@ AVCodec amr_wb_encoder = NULL, }; -#endif //AMR_WB +#endif //CONFIG_AMR_WB |