diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-01-14 07:57:12 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-01-14 07:57:12 +0000 |
| commit | 0f6a659ddfbe155dc8a516b963357ab6e01a0960 (patch) | |
| tree | 73b51e0a6c5955fc36336194edafae94ec74a729 | |
| parent | 576286ba818f16adae0fd774ebe1e63c58afddc1 (diff) | |
| download | ffmpeg-0f6a659ddfbe155dc8a516b963357ab6e01a0960.tar.gz | |
Replace #ifdef CONFIG_ preprocessor check by #if CONFIG_.
CONFIG_ changed semantics and is always defined now.
Originally committed as revision 16598 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mpegaudio.h | 4 | ||||
| -rw-r--r-- | libavcodec/mpegaudiodec.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h index 51bc0795eb..72872a353e 100644 --- a/libavcodec/mpegaudio.h +++ b/libavcodec/mpegaudio.h @@ -51,7 +51,7 @@ #define MP3_MASK 0xFFFE0CCF -#ifdef CONFIG_MPEGAUDIO_HP +#if CONFIG_MPEGAUDIO_HP #define FRAC_BITS 23 /* fractional bits for sb_samples and dct */ #define WFRAC_BITS 16 /* fractional bits for window */ #else @@ -63,7 +63,7 @@ #define FIX(a) ((int)((a) * FRAC_ONE)) -#if defined(CONFIG_MPEGAUDIO_HP) && defined(CONFIG_AUDIO_NONSHORT) +#if CONFIG_MPEGAUDIO_HP && CONFIG_AUDIO_NONSHORT typedef int32_t OUT_INT; #define OUT_MAX INT32_MAX #define OUT_MIN INT32_MIN diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index cda2d0ae69..3ad2c667d2 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -316,7 +316,7 @@ static int decode_init(AVCodecContext * avctx) s->avctx = avctx; -#if defined(CONFIG_MPEGAUDIO_HP) && defined(CONFIG_AUDIO_NONSHORT) +#if CONFIG_MPEGAUDIO_HP && CONFIG_AUDIO_NONSHORT avctx->sample_fmt= SAMPLE_FMT_S32; #else avctx->sample_fmt= SAMPLE_FMT_S16; |