[FFmpeg-cvslog] r16594 - in trunk/libavcodec: mpc.c mpc7.c mpc8.c mpegaudio.h mpegaudiodec.c qdm2.c

[Aurelien Jacobs]

diego wrote:

> Author: diego
> Date: Wed Jan 14 01:48:17 2009
> New Revision: 16594
> 
> Log:
> Use CONFIG_MPEGAUDIO_HP directly instead of USE_HIGHPRECISION indirection.
> 
> Modified:
>    trunk/libavcodec/mpc.c
>    trunk/libavcodec/mpc7.c
>    trunk/libavcodec/mpc8.c
>    trunk/libavcodec/mpegaudio.h
>    trunk/libavcodec/mpegaudiodec.c
>    trunk/libavcodec/qdm2.c
> 
> Modified: trunk/libavcodec/mpegaudio.h
> ==============================================================================
> --- trunk/libavcodec/mpegaudio.h	Wed Jan 14 01:45:04 2009	(r16593)
> +++ trunk/libavcodec/mpegaudio.h	Wed Jan 14 01:48:17 2009	(r16594)
> @@ -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

You will need to loose some bad habits...
No more #ifdef !

> -#if defined(USE_HIGHPRECISION) && defined(CONFIG_AUDIO_NONSHORT)
> +#if defined(CONFIG_MPEGAUDIO_HP) && defined(CONFIG_AUDIO_NONSHORT)

And no defined() here.
(keep the defined() for CONFIG_AUDIO_NONSHORT as it's not set by anything
for now)

> Modified: trunk/libavcodec/mpegaudiodec.c
> ==============================================================================
> --- trunk/libavcodec/mpegaudiodec.c	Wed Jan 14 01:45:04 2009	(r16593)
> +++ trunk/libavcodec/mpegaudiodec.c	Wed Jan 14 01:48:17 2009	(r16594)
> @@ -34,12 +34,6 @@
>  [...]
>  
> -#if defined(USE_HIGHPRECISION) && defined(CONFIG_AUDIO_NONSHORT)
> +#if defined(CONFIG_MPEGAUDIO_HP) && defined(CONFIG_AUDIO_NONSHORT)

Same here.

Aurel