diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-01-14 00:48:17 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-01-14 00:48:17 +0000 |
| commit | ad1eebe360dc587c676d8230d71b9156a0e197f0 (patch) | |
| tree | 6c9b1254b4bb59dfb2f701beeb86077c71756764 | |
| parent | ddda628e810de14d8e5a84cae9f5d0bf66d9909c (diff) | |
| download | ffmpeg-ad1eebe360dc587c676d8230d71b9156a0e197f0.tar.gz | |
Use CONFIG_MPEGAUDIO_HP directly instead of USE_HIGHPRECISION indirection.
Originally committed as revision 16594 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mpc.c | 4 | ||||
| -rw-r--r-- | libavcodec/mpc7.c | 4 | ||||
| -rw-r--r-- | libavcodec/mpc8.c | 4 | ||||
| -rw-r--r-- | libavcodec/mpegaudio.h | 7 | ||||
| -rw-r--r-- | libavcodec/mpegaudiodec.c | 8 | ||||
| -rw-r--r-- | libavcodec/qdm2.c | 5 |
6 files changed, 3 insertions, 29 deletions
diff --git a/libavcodec/mpc.c b/libavcodec/mpc.c index 3a5b83bb3b..596a5e9f34 100644 --- a/libavcodec/mpc.c +++ b/libavcodec/mpc.c @@ -29,10 +29,6 @@ #include "avcodec.h" #include "bitstream.h" #include "dsputil.h" - -#if CONFIG_MPEGAUDIO_HP -#define USE_HIGHPRECISION -#endif #include "mpegaudio.h" #include "mpc.h" diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c index 168e60b995..a22baac915 100644 --- a/libavcodec/mpc7.c +++ b/libavcodec/mpc7.c @@ -29,10 +29,6 @@ #include "avcodec.h" #include "bitstream.h" #include "dsputil.h" - -#if CONFIG_MPEGAUDIO_HP -#define USE_HIGHPRECISION -#endif #include "mpegaudio.h" #include "mpc.h" diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c index 9e21f09139..29f2e5f158 100644 --- a/libavcodec/mpc8.c +++ b/libavcodec/mpc8.c @@ -29,10 +29,6 @@ #include "avcodec.h" #include "bitstream.h" #include "dsputil.h" - -#if CONFIG_MPEGAUDIO_HP -#define USE_HIGHPRECISION -#endif #include "mpegaudio.h" #include "mpc.h" diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h index 33af18dc1a..51bc0795eb 100644 --- a/libavcodec/mpegaudio.h +++ b/libavcodec/mpegaudio.h @@ -51,10 +51,7 @@ #define MP3_MASK 0xFFFE0CCF -/* define USE_HIGHPRECISION to have a bit exact (but slower) mpeg - audio decoder */ - -#ifdef USE_HIGHPRECISION +#ifdef CONFIG_MPEGAUDIO_HP #define FRAC_BITS 23 /* fractional bits for sb_samples and dct */ #define WFRAC_BITS 16 /* fractional bits for window */ #else @@ -66,7 +63,7 @@ #define FIX(a) ((int)((a) * FRAC_ONE)) -#if defined(USE_HIGHPRECISION) && defined(CONFIG_AUDIO_NONSHORT) +#if defined(CONFIG_MPEGAUDIO_HP) && defined(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 efab550e4f..cda2d0ae69 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -34,12 +34,6 @@ * - test lsf / mpeg25 extensively. */ -/* define USE_HIGHPRECISION to have a bit exact (but slower) mpeg - audio decoder */ -#if CONFIG_MPEGAUDIO_HP -# define USE_HIGHPRECISION -#endif - #include "mpegaudio.h" #include "mpegaudiodecheader.h" @@ -322,7 +316,7 @@ static int decode_init(AVCodecContext * avctx) s->avctx = avctx; -#if defined(USE_HIGHPRECISION) && defined(CONFIG_AUDIO_NONSHORT) +#if defined(CONFIG_MPEGAUDIO_HP) && defined(CONFIG_AUDIO_NONSHORT) avctx->sample_fmt= SAMPLE_FMT_S32; #else avctx->sample_fmt= SAMPLE_FMT_S16; diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c index 9727d599ac..67fa0ddf25 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -38,11 +38,6 @@ #include "avcodec.h" #include "bitstream.h" #include "dsputil.h" - -#if CONFIG_MPEGAUDIO_HP -#define USE_HIGHPRECISION -#endif - #include "mpegaudio.h" #include "qdm2data.h" |