* 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>