diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-13 23:44:16 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-13 23:44:16 +0000 |
| commit | b250f9c66d3ddd84652d158fb979a5f21e3f2c71 (patch) | |
| tree | ef84366029d6f8af6ed82e90c5f188bb7dfc844d /libavcodec/libamr.c | |
| parent | 959da985b03570cfe7d239c0ba6d550ecb04c460 (diff) | |
| download | ffmpeg-b250f9c66d3ddd84652d158fb979a5f21e3f2c71.tar.gz | |
Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.
Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/libamr.c')
| -rw-r--r-- | libavcodec/libamr.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/libamr.c b/libavcodec/libamr.c index 79ca57ff37..80cb09019b 100644 --- a/libavcodec/libamr.c +++ b/libavcodec/libamr.c @@ -65,7 +65,7 @@ #include "avcodec.h" -#ifdef CONFIG_LIBAMR_NB_FIXED +#if CONFIG_LIBAMR_NB_FIXED #define MMS_IO @@ -137,7 +137,7 @@ static void amr_decode_fix_avctx(AVCodecContext * avctx) avctx->sample_fmt = SAMPLE_FMT_S16; } -#ifdef CONFIG_LIBAMR_NB_FIXED +#if CONFIG_LIBAMR_NB_FIXED /* fixed point version*/ /* frame size in serial bitstream file (frame type + serial stream + flags) */ #define SERIAL_FRAMESIZE (1+MAX_SERIAL_SIZE+5) @@ -353,7 +353,7 @@ static int amr_nb_encode_frame(AVCodecContext *avctx, } -#elif defined(CONFIG_LIBAMR_NB) /* Float point version*/ +#elif CONFIG_LIBAMR_NB /* Float point version*/ typedef struct AMRContext { int frameCount; @@ -492,7 +492,7 @@ static int amr_nb_encode_frame(AVCodecContext *avctx, #endif -#if defined(CONFIG_LIBAMR_NB) || defined(CONFIG_LIBAMR_NB_FIXED) +#if CONFIG_LIBAMR_NB || CONFIG_LIBAMR_NB_FIXED AVCodec libamr_nb_decoder = { @@ -524,7 +524,7 @@ AVCodec libamr_nb_encoder = #endif /* -----------AMR wideband ------------*/ -#ifdef CONFIG_LIBAMR_WB +#if CONFIG_LIBAMR_WB #ifdef _TYPEDEF_H //To avoid duplicate typedefs from typedef in amr-nb |