summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2012-06-08 15:07:09 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2012-06-08 15:29:24 +0200
commit37a9cdfc2c3f14d3962fef29f61d1784b8fc8918 (patch)
tree4b91dd8f016b1d3e7ef6ae4f0e663e8f12f94af0
parent8a880d69186b992c6b8d85a988541cff9ea629bf (diff)
Fix dirac decoder build dependencies.
Found, analysed and tested by trac user Jamal. Fixes part of ticket #1428.
-rwxr-xr-xconfigure1
-rw-r--r--libavcodec/Makefile2
2 files changed, 2 insertions, 1 deletions
diff --git a/configure b/configure
index f887f14d12..45adc66f0a 100755
--- a/configure
+++ b/configure
@@ -1419,6 +1419,7 @@ cavs_decoder_select="golomb"
cook_decoder_select="mdct sinewin"
cscd_decoder_suggest="zlib"
dca_decoder_select="mdct"
+dirac_decoder_select="dwt golomb"
dnxhd_encoder_select="aandct"
dxa_decoder_select="zlib"
eac3_decoder_select="ac3_decoder"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index d3ce342159..918e8c1399 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -37,7 +37,7 @@ OBJS-$(CONFIG_AC3DSP) += ac3dsp.o
OBJS-$(CONFIG_CRYSTALHD) += crystalhd.o
OBJS-$(CONFIG_ENCODERS) += faandct.o jfdctfst.o jfdctint.o
OBJS-$(CONFIG_DCT) += dct.o dct32_fixed.o dct32_float.o
-OBJS-$(CONFIG_DWT) += dwt.o
+OBJS-$(CONFIG_DWT) += dwt.o snow.o
OBJS-$(CONFIG_DXVA2) += dxva2.o
FFT-OBJS-$(CONFIG_HARDCODED_TABLES) += cos_tables.o cos_fixed_tables.o
OBJS-$(CONFIG_FFT) += avfft.o fft_fixed.o fft_float.o \