On Wed, Oct 10, 2012 at 11:55:57AM +0100, Måns Rullgård wrote:
> Diego Biurrun <di...@biurrun.de> writes:
> > On Wed, Oct 10, 2012 at 11:31:40AM +0100, Måns Rullgård wrote:
> >> Diego Biurrun <di...@biurrun.de> writes:
> >> > diff --git a/libavutil/inverse.c b/libavcodec/mathops.c
> >> > similarity index 79%
> >> > rename from libavutil/inverse.c
> >> > rename to libavcodec/mathops.c
> >> > index 5a5c490..45d06eb 100644
> >> > --- a/libavutil/inverse.c
> >> > +++ b/libavcodec/mathops.c
> >> > @@ -1,7 +1,4 @@
> >> > /*
> >> > - * Inverse table
> >> > - * Copyright (c) 2002-2004 Michael Niedermayer <michae...@gmx.at>
> >> > - *
> >> > * This file is part of Libav.
> >> > *
> >> > * Libav is free software; you can redistribute it and/or
> >> > @@ -58,3 +55,14 @@ const uint32_t ff_inverse[257]={
> >> > +
> >> > +const uint8_t ff_sqrt_tab[256]={
> >> > + 0, 16, 23, 28, 32, 36, 40, 43, 46, 48, 51, 54, 56, 58, 60, 62, 64,
> >> > 66, 68, 70, 72, 74, 76, 77, 79, 80, 82, 84, 85, 87, 88, 90,
> >> > + 91, 92, 94, 95, 96, 98,
> >> > 99,100,102,103,104,105,107,108,109,110,111,112,114,115,116,117,118,119,120,121,122,123,124,125,126,127,
> >> > +128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,144,145,146,147,148,149,150,151,151,152,153,154,155,156,156,
> >> > +157,158,159,160,160,161,162,163,164,164,165,166,167,168,168,169,170,171,171,172,173,174,174,175,176,176,177,178,179,179,180,181,
> >> > +182,182,183,184,184,185,186,186,187,188,188,189,190,190,191,192,192,193,194,194,195,196,196,197,198,198,199,200,200,201,202,202,
> >> > +203,204,204,205,205,206,207,207,208,208,209,210,210,211,212,212,213,213,214,215,215,216,216,217,218,218,219,219,220,220,221,222,
> >> > +222,223,223,224,224,225,226,226,227,227,228,228,229,230,230,231,231,232,232,233,233,234,235,235,236,236,237,237,238,238,239,239,
> >> > +240,240,241,242,242,243,243,244,244,245,245,246,246,247,247,248,248,249,249,250,250,251,251,252,252,253,253,254,254,255,255,255
> >> > +};
> >>
> >> The inverse table _MUST_ be in separate file from anything else.
> >> Otherwise linking will fail when it clashes with the one from libavutil.
> >
> > You seem to have misread the patch. It does not duplicate a table,
> > but move it. There is no duplicate to clash with.
>
> I did not misread anything. It adds a table to a file containing a
> duplicated table. The ff_inverse table must remain in a file of its
> own.
No. The file libavcodec/mathops.c ends up containing ff_sqrt_tab and
ff_inverse, but none of the two tables are duplicated.
Diego
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
