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 | |
| 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')
| -rw-r--r-- | tests/ref/fate/dds-rgb16 | 2 | ||||
| -rw-r--r-- | tests/ref/fate/dds-rgb24 | 2 | ||||
| -rw-r--r-- | tests/ref/fate/dds-uyvy | 2 | ||||
| -rw-r--r-- | tests/ref/fate/dds-xbgr | 2 | ||||
| -rw-r--r-- | tests/ref/fate/dds-y | 2 | ||||
| -rw-r--r-- | tests/ref/fate/dds-ya | 2 | ||||
| -rw-r--r-- | tests/ref/fate/dds-yuyv | 2 | ||||
| -rw-r--r-- | tests/ref/fate/txd-16bpp | 22 | ||||
| -rw-r--r-- | tests/ref/fate/txd-odd | 2 |
9 files changed, 19 insertions, 19 deletions
diff --git a/tests/ref/fate/dds-rgb16 b/tests/ref/fate/dds-rgb16 index 688d3b9601..40a9938f34 100644 --- a/tests/ref/fate/dds-rgb16 +++ b/tests/ref/fate/dds-rgb16 @@ -1,2 +1,2 @@ #tb 0: 1/25 -0, 0, 0, 1, 32768, 0x7991785d +0, 0, 0, 1, 16384, 0xc8910265 diff --git a/tests/ref/fate/dds-rgb24 b/tests/ref/fate/dds-rgb24 index bc7724d107..3eeb1eb04c 100644 --- a/tests/ref/fate/dds-rgb24 +++ b/tests/ref/fate/dds-rgb24 @@ -1,2 +1,2 @@ #tb 0: 1/25 -0, 0, 0, 1, 32768, 0xcf0f7833 +0, 0, 0, 1, 24576, 0xef0f9653 diff --git a/tests/ref/fate/dds-uyvy b/tests/ref/fate/dds-uyvy index 6ea3f2e30b..2bcbaa0455 100644 --- a/tests/ref/fate/dds-uyvy +++ b/tests/ref/fate/dds-uyvy @@ -1,2 +1,2 @@ #tb 0: 1/25 -0, 0, 0, 1, 16384, 0xd579a59e +0, 0, 0, 1, 8192, 0x3c658750 diff --git a/tests/ref/fate/dds-xbgr b/tests/ref/fate/dds-xbgr index 63e5225f89..eb7a0246db 100644 --- a/tests/ref/fate/dds-xbgr +++ b/tests/ref/fate/dds-xbgr @@ -1,2 +1,2 @@ #tb 0: 1/25 -0, 0, 0, 1, 16384, 0x702f6a28 +0, 0, 0, 1, 16384, 0x70336a28 diff --git a/tests/ref/fate/dds-y b/tests/ref/fate/dds-y index 5b2f11b523..ae62091b65 100644 --- a/tests/ref/fate/dds-y +++ b/tests/ref/fate/dds-y @@ -1,2 +1,2 @@ #tb 0: 1/25 -0, 0, 0, 1, 32768, 0xc51add1c +0, 0, 0, 1, 8192, 0x56eca90f diff --git a/tests/ref/fate/dds-ya b/tests/ref/fate/dds-ya index 59e3203a4e..d6527c638d 100644 --- a/tests/ref/fate/dds-ya +++ b/tests/ref/fate/dds-ya @@ -1,2 +1,2 @@ #tb 0: 1/25 -0, 0, 0, 1, 56320, 0xa614eb1e +0, 0, 0, 1, 28160, 0xd3981fcb diff --git a/tests/ref/fate/dds-yuyv b/tests/ref/fate/dds-yuyv index 6ea3f2e30b..e65c9507da 100644 --- a/tests/ref/fate/dds-yuyv +++ b/tests/ref/fate/dds-yuyv @@ -1,2 +1,2 @@ #tb 0: 1/25 -0, 0, 0, 1, 16384, 0xd579a59e +0, 0, 0, 1, 8192, 0xc1108750 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 diff --git a/tests/ref/fate/txd-odd b/tests/ref/fate/txd-odd index 15b9ed3b63..fe7c615e4f 100644 --- a/tests/ref/fate/txd-odd +++ b/tests/ref/fate/txd-odd @@ -1,2 +1,2 @@ #tb 0: 1/5 -0, 0, 0, 1, 385452, 0xb22514d6 +0, 0, 0, 1, 385452, 0x055a14d6 |