Mercurial > libavcodec.hg
diff amr.c @ 3463:444bd402aebe libavcodec
rename AMR config variables to CONFIG_AMR*
author | mru |
---|---|
date | Wed, 12 Jul 2006 16:49:14 +0000 |
parents | 0b546eab515d |
children | c8c591fe26f8 |
line wrap: on
line diff
--- a/amr.c Wed Jul 12 15:19:51 2006 +0000 +++ b/amr.c Wed Jul 12 16:49:14 2006 +0000 @@ -55,7 +55,7 @@ #include "avcodec.h" -#ifdef AMR_NB_FIXED +#ifdef CONFIG_AMR_NB_FIXED #define MMS_IO @@ -107,7 +107,7 @@ 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 @@ } -#elif defined(AMR_NB) /* Float point version*/ +#elif defined(CONFIG_AMR_NB) /* Float point version*/ typedef struct AMRContext { int frameCount; @@ -457,7 +457,7 @@ #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 @@ #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 @@ NULL, }; -#endif //AMR_WB +#endif //CONFIG_AMR_WB