[FFmpeg-cvslog] r15151 - in trunk: configure libavcodec/Makefile

[Diego Biurrun]

On Tue, Sep 02, 2008 at 06:04:27AM +0200, jbr wrote:
> 
> Log:
> add a separate line in Makefile for E-AC-3 decoder and only compile it when
> GPL is enabled. fixes building without GPL or with liba52.
> 
> --- trunk/configure	(original)
> +++ trunk/configure	Tue Sep  2 06:04:26 2008
> @@ -848,6 +848,7 @@ byteswap_h_deps="!armv4l"
>  # decoders / encoders
>  ac3_decoder_deps="gpl !liba52"
>  dxa_decoder_deps="zlib"
> +eac3_decoder_deps="gpl"
> 
> --- trunk/libavcodec/Makefile	(original)
> +++ trunk/libavcodec/Makefile	Tue Sep  2 06:04:26 2008
> @@ -63,6 +63,7 @@ OBJS-$(CONFIG_DVDSUB_ENCODER)          +
>  OBJS-$(CONFIG_DXA_DECODER)             += dxa.o
> +OBJS-$(CONFIG_EAC3_DECODER)            += eac3dec.o ac3dec.o ac3tab.o ac3dec_data.o ac3.o mdct.o fft.o

I think it's easier to just make the E-AC-3 decoder depend on the AC-3
decoder.

Diego