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

[Måns Rullgård]

Michael Niedermayer <michaelni at gmx.at> writes:

> On Thu, Jul 01, 2010 at 06:14:45PM +0100, M?ns Rullg?rd wrote:
>> Vitor Sessak <vitor1001 at gmail.com> writes:
>> 
>> > 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?
>> 
>> I suppose it can.  OK to do that?
>
> ok

Done.

-- 
M?ns Rullg?rd
mans at mansr.com