virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

rename AMR config variables to CONFIG_AMR*

Browse Source 
Originally committed as revision 5725 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2006-07-12 16:49:14 +00:00
parent 8515d1c846
commit 6636b7e8e3
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure vendored
View File

@ -2066,13 +2066,13 @@ echo "SRC_PATH=$source_path" >> config.mak
echo "BUILD_ROOT=$PWD" >> config.mak echo "BUILD_ROOT=$PWD" >> config.mak
if test "$amr" = "yes" ; then if test "$amr" = "yes" ; then
echo "#define AMR 1" >> $TMPH echo "#define CONFIG_AMR 1" >> $TMPH
echo "AMR=yes" >> config.mak echo "CONFIG_AMR=yes" >> config.mak
fi fi
if test "$amr_wb" = "yes" ; then if test "$amr_wb" = "yes" ; then
echo "#define AMR_WB 1" >> $TMPH echo "#define CONFIG_AMR_WB 1" >> $TMPH
echo "AMR_WB=yes" >> config.mak echo "CONFIG_AMR_WB=yes" >> config.mak
echo echo
echo "AMR WB FLOAT NOTICE ! Make sure you have downloaded TS26.204" echo "AMR WB FLOAT NOTICE ! Make sure you have downloaded TS26.204"
echo "V5.1.0 from " echo "V5.1.0 from "
@ -2081,8 +2081,8 @@ if test "$amr_wb" = "yes" ; then
fi fi
if test "$amr_nb" = "yes" ; then if test "$amr_nb" = "yes" ; then
echo "#define AMR_NB 1" >> $TMPH echo "#define CONFIG_AMR_NB 1" >> $TMPH
echo "AMR_NB=yes" >> config.mak echo "CONFIG_AMR_NB=yes" >> config.mak
echo echo
echo "AMR NB FLOAT NOTICE ! Make sure you have downloaded TS26.104" echo "AMR NB FLOAT NOTICE ! Make sure you have downloaded TS26.104"
echo "REL-5 V5.1.0 from " echo "REL-5 V5.1.0 from "
@ -2092,8 +2092,8 @@ if test "$amr_nb" = "yes" ; then
fi fi
if test "$amr_nb_fixed" = "yes" ; then if test "$amr_nb_fixed" = "yes" ; then
echo "#define AMR_NB_FIXED 1" >> $TMPH echo "#define CONFIG_AMR_NB_FIXED 1" >> $TMPH
echo "AMR_NB_FIXED=yes" >> config.mak echo "CONFIG_AMR_NB_FIXED=yes" >> config.mak
echo echo
echo "AMR NB FIXED POINT NOTICE! Make sure you have downloaded TS26.073 " echo "AMR NB FIXED POINT NOTICE! Make sure you have downloaded TS26.073 "
echo "REL-5 version 5.1.0 from " echo "REL-5 version 5.1.0 from "

8
libavcodec/Makefile
View File

@ -228,18 +228,18 @@ OBJS-$(CONFIG_AC3)$(CONFIG_A52BIN) += liba52/bit_allocate.o \
# currently using libdts for dts decoding # currently using libdts for dts decoding
OBJS-$(CONFIG_DTS) += dtsdec.o OBJS-$(CONFIG_DTS) += dtsdec.o
OBJS-$(AMR) += amr.o OBJS-$(CONFIG_AMR) += amr.o
OBJS-$(AMR_NB) += amr_float/sp_dec.o \ OBJS-$(CONFIG_AMR_NB) += amr_float/sp_dec.o \
amr_float/sp_enc.o \ amr_float/sp_enc.o \
amr_float/interf_dec.o \ amr_float/interf_dec.o \
amr_float/interf_enc.o amr_float/interf_enc.o
ifeq ($(AMR_NB_FIXED),yes) ifeq ($(CONFIG_AMR_NB_FIXED),yes)
EXTRAOBJS += amr/*.o EXTRAOBJS += amr/*.o
EXTRADEPS=amrlibs EXTRADEPS=amrlibs
endif 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_dtx.o \
amrwb_float/dec_gain.o \ amrwb_float/dec_gain.o \
amrwb_float/dec_if.o \ amrwb_float/dec_if.o \

8
libavcodec/allcodecs.c
View File

@ -540,7 +540,7 @@ void avcodec_register_all(void)
#endif //CONFIG_FLASHSV_DECODER #endif //CONFIG_FLASHSV_DECODER
#endif /* CONFIG_DECODERS */ #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 #ifdef CONFIG_AMR_NB_DECODER
register_avcodec(&amr_nb_decoder); register_avcodec(&amr_nb_decoder);
#endif //CONFIG_AMR_NB_DECODER #endif //CONFIG_AMR_NB_DECODER
@ -549,9 +549,9 @@ void avcodec_register_all(void)
register_avcodec(&amr_nb_encoder); register_avcodec(&amr_nb_encoder);
#endif //CONFIG_AMR_NB_ENCODER #endif //CONFIG_AMR_NB_ENCODER
#endif //CONFIG_ENCODERS #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 #ifdef CONFIG_AMR_WB_DECODER
register_avcodec(&amr_wb_decoder); register_avcodec(&amr_wb_decoder);
#endif //CONFIG_AMR_WB_DECODER #endif //CONFIG_AMR_WB_DECODER
@ -560,7 +560,7 @@ void avcodec_register_all(void)
register_avcodec(&amr_wb_encoder); register_avcodec(&amr_wb_encoder);
#endif //CONFIG_AMR_WB_ENCODER #endif //CONFIG_AMR_WB_ENCODER
#endif //CONFIG_ENCODERS #endif //CONFIG_ENCODERS
#endif /* AMR_WB */ #endif /* CONFIG_AMR_WB */
#ifdef CONFIG_BMP_DECODER #ifdef CONFIG_BMP_DECODER
register_avcodec(&bmp_decoder); register_avcodec(&bmp_decoder);

12
libavcodec/amr.c
View File

@ -55,7 +55,7 @@
#include "avcodec.h" #include "avcodec.h"
#ifdef AMR_NB_FIXED #ifdef CONFIG_AMR_NB_FIXED
#define MMS_IO #define MMS_IO
@ -107,7 +107,7 @@ static enum Mode getBitrateMode(int bitrate)
return(MR122); return(MR122);
} }
#ifdef AMR_NB_FIXED #ifdef CONFIG_AMR_NB_FIXED
/* fixed point version*/ /* fixed point version*/
/* frame size in serial bitstream file (frame type + serial stream + flags) */ /* frame size in serial bitstream file (frame type + serial stream + flags) */
#define SERIAL_FRAMESIZE (1+MAX_SERIAL_SIZE+5) #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 { typedef struct AMRContext {
int frameCount; int frameCount;
@ -457,7 +457,7 @@ static int amr_nb_encode_frame(AVCodecContext *avctx,
#endif #endif
#if defined(AMR_NB) || defined(AMR_NB_FIXED) #if defined(CONFIG_AMR_NB) || defined(CONFIG_AMR_NB_FIXED)
AVCodec amr_nb_decoder = AVCodec amr_nb_decoder =
{ {
@ -486,7 +486,7 @@ AVCodec amr_nb_encoder =
#endif #endif
/* -----------AMR wideband ------------*/ /* -----------AMR wideband ------------*/
#ifdef AMR_WB #ifdef CONFIG_AMR_WB
#ifdef _TYPEDEF_H #ifdef _TYPEDEF_H
//To avoid duplicate typedefs from typdef in amr-nb //To avoid duplicate typedefs from typdef in amr-nb
@ -661,4 +661,4 @@ AVCodec amr_wb_encoder =
NULL, NULL,
}; };
#endif //AMR_WB #endif //CONFIG_AMR_WB