[Ffmpeg-cvslog] r5787 - in trunk: MAINTAINERS libavformat/Makefile libavformat/allformats.c libavformat/allformats.h libavformat/gxf.h libavformat/gxfenc.c

[Diego Biurrun]

On Wed, Jul 19, 2006 at 12:49:19PM +0200, Diego Biurrun wrote:
> On Wed, Jul 19, 2006 at 11:38:22AM +0200, bcoudurier wrote:
> > 
> > Log:
> > GXF muxer
> > 
> > --- trunk/libavformat/Makefile	(original)
> > +++ trunk/libavformat/Makefile	Wed Jul 19 11:38:22 2006
> > @@ -183,6 +183,10 @@
> >  
> > +ifeq ($(CONFIG_GPL),yes)
> > +OBJS-$(CONFIG_GXF_MUXER)                 += gxfenc.o
> > +endif
> > +
> > 
> > --- trunk/libavformat/allformats.c	(original)
> > +++ trunk/libavformat/allformats.c	Wed Jul 19 11:38:22 2006
> > @@ -138,6 +138,9 @@
> > +#if defined(CONFIG_GXF_MUXER) && defined(CONFIG_GPL)
> > +    av_register_output_format(&gxf_muxer);
> > +#endif
> 
> Note (to self): This should be done from configure.  CONFIG_GXF_MUXER
> should only be set if --enable-gpl is specified.

Alternative: Disable the GXF muxer by default and add a configure option
to enable it, same as with the other GPL code.

Diego