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

Michael Niedermayer michaelni
Thu Jul 1 21:27:50 CEST 2010


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

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I wish the Xiph folks would stop pretending they've got something they
do not.  Somehow I fear this will remain a wish. -- M?ns Rullg?rd
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20100701/0a3da4cd/attachment.pgp>



More information about the ffmpeg-devel mailing list