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 /tests/fate/video.mak | |
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 'tests/fate/video.mak')
-rw-r--r-- | tests/fate/video.mak | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 9f65694f77..314f16889a 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -280,6 +280,9 @@ fate-tmv: CMD = framecrc -i $(TARGET_SAMPLES)/tmv/pop-partial.tmv -pix_fmt rgb24 FATE_TXD += fate-txd-16bpp fate-txd-16bpp: CMD = framecrc -i $(TARGET_SAMPLES)/txd/misc.txd -pix_fmt bgra -an +FATE_TXD += fate-txd-odd +fate-txd-odd: CMD = framecrc -i $(TARGET_SAMPLES)/txd/odd.txd -pix_fmt bgra -an + FATE_TXD += fate-txd-pal8 fate-txd-pal8: CMD = framecrc -i $(TARGET_SAMPLES)/txd/outro.txd -pix_fmt rgb24 -an |