# HG changeset patch
# User diego
# Date 1231894097 0
# Node ID 9aac5b3cecbd896b5dee9da2686b3942ef971c8e
# Parent  d1e300c41ed53ff2e4d4f1afd8793043617a3763
Use CONFIG_MPEGAUDIO_HP directly instead of USE_HIGHPRECISION indirection.

diff -r d1e300c41ed5 -r 9aac5b3cecbd mpc.c
--- a/mpc.c	Wed Jan 14 00:27:43 2009 +0000
+++ b/mpc.c	Wed Jan 14 00:48:17 2009 +0000
@@ -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 -r d1e300c41ed5 -r 9aac5b3cecbd mpc7.c
--- a/mpc7.c	Wed Jan 14 00:27:43 2009 +0000
+++ b/mpc7.c	Wed Jan 14 00:48:17 2009 +0000
@@ -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 -r d1e300c41ed5 -r 9aac5b3cecbd mpc8.c
--- a/mpc8.c	Wed Jan 14 00:27:43 2009 +0000
+++ b/mpc8.c	Wed Jan 14 00:48:17 2009 +0000
@@ -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 -r d1e300c41ed5 -r 9aac5b3cecbd mpegaudio.h
--- a/mpegaudio.h	Wed Jan 14 00:27:43 2009 +0000
+++ b/mpegaudio.h	Wed Jan 14 00:48:17 2009 +0000
@@ -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 -r d1e300c41ed5 -r 9aac5b3cecbd mpegaudiodec.c
--- a/mpegaudiodec.c	Wed Jan 14 00:27:43 2009 +0000
+++ b/mpegaudiodec.c	Wed Jan 14 00:48:17 2009 +0000
@@ -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 @@
 
     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 -r d1e300c41ed5 -r 9aac5b3cecbd qdm2.c
--- a/qdm2.c	Wed Jan 14 00:27:43 2009 +0000
+++ b/qdm2.c	Wed Jan 14 00:48:17 2009 +0000
@@ -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"