[FFmpeg-devel] FreeBSD libamr.c block_size error

[John Fitzgerald]

On Thu, Feb 28, 2008 at 8:16 AM, Reimar D?ffinger
<Reimar.Doeffinger at stud.uni-karlsruhe.de> wrote:
> On Thu, Feb 28, 2008 at 01:33:43PM +0100, Michael Niedermayer wrote:
> > On Wed, Feb 27, 2008 at 10:23:27AM -0500, John J Fitzgerald wrote:
> > > Ah, right, thanks.
> > >
> > > The diff -urN patch is named freebsd_libamr.patch and can be downloaded
> > > here:
> > >
> > > http://www.mediafire.com/?dnl0z5xrrae
> > >
> > > Contents of freebsd_libamr.patch:
> > >
> > > --- libavcodec/libamr.c.orig    Wed Feb 27 11:21:44 2008
> > > +++ libavcodec/libamr.c Wed Feb 27 11:21:58 2008
> > > @@ -663,6 +663,7 @@
> > >      }
> > >
> > >      mode = (amrData[0] >> 3) & 0x000F;
> > > +    static short block_size[16]={18, 23, 33, 37, 41, 47, 51, 59, 61, 6, 6,
> > > 0, 0, 0, 1, 1};
> >
> > The patch is mangled, attach it properly!
> > Also const is missing and it should be unit8_t.
>
> uint8_t actually. And the variable declaration should not be in the
> middle of the code either.
>

How's this diff -urN patch look? I hardly ever code in C or create
patches, so please look it over. I prepended the block_size variables
with nb_ and wb_ respectively because I think (?) that static
variables are program-wide, so if that's the case, I wanted to avoid
any conflict. But I don't know if I even declared the variables
correctly.

Cheers,

JJ
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: freebsd_libamr.patch
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20080228/2156ac4e/attachment.txt>