[SCM] libav/experimental: 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.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:29:15 UTC 2013


The following commit has been merged in the experimental branch:
commit 406ab5cc97e3b2552c9f18d39efd76b4dc3e2f51
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date:   Tue Sep 2 04:04:26 2008 +0000

    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.
    
    Originally committed as revision 15151 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index 6195d81..94077a4 100755
--- a/configure
+++ b/configure
@@ -848,6 +848,7 @@ byteswap_h_deps="!armv4l"
 # decoders / encoders
 ac3_decoder_deps="gpl !liba52"
 dxa_decoder_deps="zlib"
+eac3_decoder_deps="gpl"
 flashsv_decoder_deps="zlib"
 flashsv_encoder_deps="zlib"
 mlp_decoder_deps="mlp_parser"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index d7953da..e987ddd 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -63,6 +63,7 @@ OBJS-$(CONFIG_DVDSUB_ENCODER)          += dvdsubenc.o
 OBJS-$(CONFIG_DVVIDEO_DECODER)         += dv.o
 OBJS-$(CONFIG_DVVIDEO_ENCODER)         += dv.o
 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
 OBJS-$(CONFIG_EACMV_DECODER)           += eacmv.o
 OBJS-$(CONFIG_EATGV_DECODER)           += eatgv.o
 OBJS-$(CONFIG_EIGHTBPS_DECODER)        += 8bps.o

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list