[Ffmpeg-cvslog] r7138 - trunk/libavformat/matroska.c

[Aurelien Jacobs]

On Sat, 16 Dec 2006 19:33:07 +0000
M?ns Rullg?rd <mru at inprovide.com> wrote:

> Aurelien Jacobs <aurel at gnuage.org> writes:
> 
> > On Sat, 16 Dec 2006 17:18:20 +0100
> > Reimar D?ffinger <Reimar.Doeffinger at stud.uni-karlsruhe.de> wrote:
> >
> >> Hello,
> >> On Mon, Nov 20, 2006 at 09:16:32PM +0100, aurel wrote:
> >> >
> >> > +                init_put_byte(&b, extradata, extradata_size, 1,
> >> > +                              NULL, NULL, NULL, NULL);
> >> > +                put_buffer(&b, (uint8_t *) "TTA1", 4);
> >> > +                put_le16(&b, 1);
> >> > +                put_le16(&b, audiotrack->channels);
> >> > +                put_le16(&b, audiotrack->bitdepth);
> >> > +                put_le32(&b, audiotrack->samplerate);
> >> 
> >> This breaks compilation with --disable-muxers --disable-protocols.
> >
> > Oh ! Indeed :-(
> > Thanks to find this out.
> >
> > Attached is a dirty fix. But I would prefer to simply remove this
> > ifdef. There is IMO no reason to limit put_* functions to
> > MUXERS and PROTOCOLS. Anyone disagree ??
> 
> [...]
> 
> > -#if defined(CONFIG_MUXERS) || defined(CONFIG_PROTOCOLS)
> > +#if defined(CONFIG_MUXERS) || defined(CONFIG_PROTOCOLS) || defined(CONFIG_MATROSKA_DEMUXER)
> 
> Patch rejected.  I vote for removing that ifdef entirely.

That's also my opinion. => Fixed by removing ifdef.

Aurel