[FFmpeg-cvslog] r16598 - in trunk/libavcodec: mpegaudio.h mpegaudiodec.c

[diego]

Author: diego
Date: Wed Jan 14 08:57:12 2009
New Revision: 16598

Log:
Replace #ifdef CONFIG_ preprocessor check by #if CONFIG_.
CONFIG_ changed semantics and is always defined now.

Modified:
   trunk/libavcodec/mpegaudio.h
   trunk/libavcodec/mpegaudiodec.c

Modified: trunk/libavcodec/mpegaudio.h
==============================================================================
--- trunk/libavcodec/mpegaudio.h	Wed Jan 14 08:55:43 2009	(r16597)
+++ trunk/libavcodec/mpegaudio.h	Wed Jan 14 08:57:12 2009	(r16598)
@@ -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

Modified: trunk/libavcodec/mpegaudiodec.c
==============================================================================
--- trunk/libavcodec/mpegaudiodec.c	Wed Jan 14 08:55:43 2009	(r16597)
+++ trunk/libavcodec/mpegaudiodec.c	Wed Jan 14 08:57:12 2009	(r16598)
@@ -316,7 +316,7 @@ static int decode_init(AVCodecContext * 
 
     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;