Use CONFIG_MPEGAUDIO_HP directly instead of USE_HIGHPRECISION indirection.

Originally committed as revision 16594 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpc.c b/libavcodec/mpc.c
index 3a5b83bb3bf9c31469d548837f0e03df321963f2..596a5e9f34feafc47547f1f0bb7fec24e62ba524 100644 (file)
--- 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 168e60b995d53d28f6ea3cc8d3feff83647223a1..a22baac91525386d4eac7603af0fc57908e23c38 100644 (file)
--- 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 9e21f09139fbd2e51e97990c48ca42b237f204af..29f2e5f158adc775ef785a7ecc959b10d4ae1022 100644 (file)
--- 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 33af18dc1ad9f7537d8033a591928399afc24f2f..51bc0795eb2521355e669e5697429d18338a7b7e 100644 (file)
--- 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 efab550e4f9d03852e510d501ff2f631d0f74d72..cda2d0ae69a47b2bd4ef95b5a8011ae8bc6a46e4 100644 (file)
--- 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 9727d599acce73486fc68a38a445528d73fe9d2b..67fa0ddf2560b2dc392bd9e4c102f056a727b239 100644 (file)
--- 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"