# HG changeset patch # User diego # Date 1231919832 0 # Node ID c5349ca95c086dc69466e7879b26dd9ffbf42558 # Parent 7de1d00618e49b65b35dfafa30bce44cc38e8f88 Replace #ifdef CONFIG_ preprocessor check by #if CONFIG_. CONFIG_ changed semantics and is always defined now. diff -r 7de1d00618e4 -r c5349ca95c08 mpegaudio.h --- a/mpegaudio.h Wed Jan 14 07:55:43 2009 +0000 +++ b/mpegaudio.h Wed Jan 14 07:57:12 2009 +0000 @@ -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 -r 7de1d00618e4 -r c5349ca95c08 mpegaudiodec.c --- a/mpegaudiodec.c Wed Jan 14 07:55:43 2009 +0000 +++ b/mpegaudiodec.c Wed Jan 14 07:57:12 2009 +0000 @@ -316,7 +316,7 @@ 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;