[FFmpeg-devel] [PATCH 1/2] mpegaudio: define only one of compute_antialias_{float, integer}

Vitor Sessak vitor1001
Thu Jul 1 19:04:19 CEST 2010


On 07/01/2010 06:26 PM, Mans Rullgard wrote:
> This removes warnings about unused functions as well as warnings about
> pointer types inside the unused functions.
> ---
>   libavcodec/mpegaudiodec.c |    6 +++---
>   1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
> index 0ae21e0..3edfc65 100644
> --- a/libavcodec/mpegaudiodec.c
> +++ b/libavcodec/mpegaudiodec.c
> @@ -73,8 +73,6 @@
>   #    include "dct32.c"
>   #endif
>
> -static void compute_antialias_integer(MPADecodeContext *s, GranuleDef *g);
> -static void compute_antialias_float(MPADecodeContext *s, GranuleDef *g);
>   static void apply_window_mp3_c(MPA_INT *synth_buf, MPA_INT *window,
>                                  int *dither_state, OUT_INT *samples, int incr);
>
> @@ -1573,6 +1571,7 @@ static void compute_stereo(MPADecodeContext *s,
>       }
>   }
>
> +#if !CONFIG_FLOAT
>   static void compute_antialias_integer(MPADecodeContext *s,
>                                 GranuleDef *g)
>   {
> @@ -1612,7 +1611,7 @@ static void compute_antialias_integer(MPADecodeContext *s,
>           ptr += 18;
>       }
>   }
> -
> +#else
>   static void compute_antialias_float(MPADecodeContext *s,
>                                 GranuleDef *g)
>   {
> @@ -1651,6 +1650,7 @@ static void compute_antialias_float(MPADecodeContext *s,
>           ptr += 18;
>       }
>   }
> +#endif /* CONFIG_FLOAT */

Can't this function be moved to mpegaudiodec_float.c?

-Vitor



More information about the ffmpeg-devel mailing list