diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-22 21:15:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-22 21:15:50 +0200 |
| commit | a5b2b22d9a45c9634e6947d43945ebafe121abec (patch) | |
| tree | 576acfb06100809f34f224253b7a15ad5b933c09 /tests | |
| parent | d1dc22dddd7937232a1d073b9d72c51587c0b9ab (diff) | |
| parent | c0b105756f61d253bdabcc2bb49453a2557e7c3b (diff) | |
| download | ffmpeg-a5b2b22d9a45c9634e6947d43945ebafe121abec.tar.gz | |
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')
| -rw-r--r-- | tests/fate/video.mak | 3 | ||||
| -rw-r--r-- | tests/ref/fate/txd-16bpp | 22 | ||||
| -rw-r--r-- | tests/ref/fate/txd-odd | 2 |
3 files changed, 16 insertions, 11 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 diff --git a/tests/ref/fate/txd-16bpp b/tests/ref/fate/txd-16bpp index 9522873946..10787415c7 100644 --- a/tests/ref/fate/txd-16bpp +++ b/tests/ref/fate/txd-16bpp @@ -1,12 +1,12 @@ #tb 0: 1/5 -0, 0, 0, 1, 16384, 0x213f9ea8 -0, 1, 1, 1, 16384, 0x8185fdb1 -0, 2, 2, 1, 16384, 0xf03581d1 -0, 3, 3, 1, 16384, 0x629cd573 -0, 4, 4, 1, 16384, 0xfe7a5b63 -0, 5, 5, 1, 16384, 0x4afc05b2 -0, 6, 6, 1, 16384, 0x074b8515 -0, 7, 7, 1, 16384, 0x17fde900 -0, 8, 8, 1, 16384, 0x831bac76 -0, 9, 9, 1, 16384, 0x2fb579f3 -0, 10, 10, 1, 16384, 0x68762bed +0, 0, 0, 1, 16384, 0x4c7bb4cb +0, 1, 1, 1, 16384, 0x914e14b4 +0, 2, 2, 1, 16384, 0x81e293cb +0, 3, 3, 1, 16384, 0xf733ed43 +0, 4, 4, 1, 16384, 0x739a6c21 +0, 5, 5, 1, 16384, 0x47f9184a +0, 6, 6, 1, 16384, 0x329f9d3e +0, 7, 7, 1, 16384, 0x231ffd9c +0, 8, 8, 1, 16384, 0xe7c2c4c6 +0, 9, 9, 1, 16384, 0x880d8ffb +0, 10, 10, 1, 16384, 0xf83238d2 diff --git a/tests/ref/fate/txd-odd b/tests/ref/fate/txd-odd new file mode 100644 index 0000000000..15b9ed3b63 --- /dev/null +++ b/tests/ref/fate/txd-odd @@ -0,0 +1,2 @@ +#tb 0: 1/5 +0, 0, 0, 1, 385452, 0xb22514d6 |