summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-22 23:26:23 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-22 23:26:23 +0100
commit9d6a27d5336550c131d2a45fc4b0e90c93e46aca (patch)
tree07fe3d8437eda2db2343a9d7d0932870e8018e8e /configure
parent74fed968d1b6f0aec9c08b9ac4fcad4314e0460a (diff)
parent57f09608e1600d1cf1679885a46f5004d522d68f (diff)
Merge commit '57f09608e1600d1cf1679885a46f5004d522d68f'
* commit '57f09608e1600d1cf1679885a46f5004d522d68f': dsputil: Move thirdpel-related bits into their own context Conflicts: libavcodec/svq3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure3
1 files changed, 2 insertions, 1 deletions
diff --git a/configure b/configure
index 5ce296199f..778a2d8db8 100755
--- a/configure
+++ b/configure
@@ -1780,6 +1780,7 @@ CONFIG_EXTRA="
rtpdec
rtpenc_chain
sinewin
+ tpeldsp
videodsp
vp3dsp
"
@@ -2090,7 +2091,7 @@ sonic_ls_encoder_select="golomb"
sp5x_decoder_select="mjpeg_decoder"
svq1_decoder_select="hpeldsp"
svq1_encoder_select="aandcttables dsputil hpeldsp mpegvideoenc"
-svq3_decoder_select="h264_decoder hpeldsp"
+svq3_decoder_select="h264_decoder hpeldsp tpeldsp"
svq3_decoder_suggest="zlib"
tak_decoder_select="dsputil"
theora_decoder_select="vp3_decoder"