diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-22 22:15:50 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-22 22:15:50 +0300 |
commit | a5b2b22d9a45c9634e6947d43945ebafe121abec (patch) | |
tree | 576acfb06100809f34f224253b7a15ad5b933c09 /configure | |
parent | d1dc22dddd7937232a1d073b9d72c51587c0b9ab (diff) | |
parent | c0b105756f61d253bdabcc2bb49453a2557e7c3b (diff) |
Merge commit 'c0b105756f61d253bdabcc2bb49453a2557e7c3b'
* commit 'c0b105756f61d253bdabcc2bb49453a2557e7c3b':
txd: Use the TextureDSP module for decoding
Conflicts:
configure
libavcodec/s3tc.c
libavcodec/s3tc.h
libavcodec/txd.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -2293,6 +2293,7 @@ truemotion2_decoder_select="bswapdsp" truespeech_decoder_select="bswapdsp" tscc_decoder_select="zlib" twinvq_decoder_select="mdct lsp sinewin" +txd_decoder_select="texturedsp" utvideo_decoder_select="bswapdsp" utvideo_encoder_select="bswapdsp huffman huffyuvencdsp" vble_decoder_select="huffyuvdsp" |