Merge commit 'c0b105756f61d253bdabcc2bb49453a2557e7c3b'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Jun 2015 19:15:50 +0000 (21:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Jun 2015 19:15:50 +0000 (21:15 +0200)
commita5b2b22d9a45c9634e6947d43945ebafe121abec
tree576acfb06100809f34f224253b7a15ad5b933c09
parentd1dc22dddd7937232a1d073b9d72c51587c0b9ab
parentc0b105756f61d253bdabcc2bb49453a2557e7c3b
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>
configure
libavcodec/Makefile
libavcodec/txd.c
tests/fate/video.mak