diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-01 03:03:20 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-01 03:03:20 +0200 |
commit | 3974889614e04f700637b564df737c180d8583ea (patch) | |
tree | 7dc5805927d14c1e6900aa9ac97ab9c53b7cb20c /tests/ref/fate/txd-16bpp | |
parent | 2e13a45b1a9a69456631e582bbb06954d169eb55 (diff) | |
parent | e2bd03a14a4e3366df0b1ee8e284a97165be1f3c (diff) | |
download | ffmpeg-3974889614e04f700637b564df737c180d8583ea.tar.gz |
Merge commit 'e2bd03a14a4e3366df0b1ee8e284a97165be1f3c'
* commit 'e2bd03a14a4e3366df0b1ee8e284a97165be1f3c':
fate: Avoid unnecessary pixel format conversions
Conflicts:
tests/fate/image.mak
tests/ref/fate/dds-ya
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/txd-16bpp')
-rw-r--r-- | tests/ref/fate/txd-16bpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/ref/fate/txd-16bpp b/tests/ref/fate/txd-16bpp index 10787415c7..33943f90ef 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, 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 +0, 0, 0, 1, 16384, 0x4d39b4cb +0, 1, 1, 1, 16384, 0x2a8d14b4 +0, 2, 2, 1, 16384, 0xe26793cb +0, 3, 3, 1, 16384, 0x62b5ed43 +0, 4, 4, 1, 16384, 0x5ae86c21 +0, 5, 5, 1, 16384, 0x416d184a +0, 6, 6, 1, 16384, 0x33f59d3e +0, 7, 7, 1, 16384, 0x3d0ffd9c +0, 8, 8, 1, 16384, 0x35bac4c6 +0, 9, 9, 1, 16384, 0xa1cd8ffb +0, 10, 10, 1, 16384, 0xf7dc38d2 |