From 0f6a659ddfbe155dc8a516b963357ab6e01a0960 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Wed, 14 Jan 2009 07:57:12 +0000
Subject: [PATCH] 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
---
libavcodec/mpegaudio.h | 4 ++--
libavcodec/mpegaudiodec.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h
index 51bc0795eb2..72872a353e5 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 cda2d0ae69a..3ad2c667d2d 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;
--
GitLab