[SCM] libav/experimental: Replace #ifdef CONFIG_ preprocessor check by #if CONFIG_. CONFIG_ changed semantics and is always defined now.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:35:17 UTC 2013


The following commit has been merged in the experimental branch:
commit 0f6a659ddfbe155dc8a516b963357ab6e01a0960
Author: Diego Biurrun <diego at biurrun.de>
Date:   Wed Jan 14 07:57:12 2009 +0000

    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

diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h
index 51bc079..72872a3 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 cda2d0a..3ad2c66 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;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list