summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-31 01:31:50 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-03-31 01:32:02 +0200
commit8e8276e0bc50560cf8c057d12af2435f89d7f386 (patch)
treefed4aeb3ffa263894816cc62061f9f1e7c7b64a8 /tests
parent0f2588d7e5d2bc92c0a61e8d3e32e90722d98a8e (diff)
parent3e4e2142d246699a1a3a0045ba7124b18bc34d7a (diff)
Merge commit '3e4e2142d246699a1a3a0045ba7124b18bc34d7a'
* commit '3e4e2142d246699a1a3a0045ba7124b18bc34d7a': fate: Convert the paletted output in the brenderpix tests to rgb24 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
-rw-r--r--tests/fate/image.mak4
-rw-r--r--tests/ref/fate/brenderpix-defpal2
-rw-r--r--tests/ref/fate/brenderpix-intpal2
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/fate/image.mak b/tests/fate/image.mak
index 09be5a4eb0..41a4f6aaf7 100644
--- a/tests/fate/image.mak
+++ b/tests/fate/image.mak
@@ -15,10 +15,10 @@ FATE_BRENDERPIX += fate-brenderpix-565
fate-brenderpix-565: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/maximafront.pix
FATE_BRENDERPIX += fate-brenderpix-defpal
-fate-brenderpix-defpal: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/rivrock1.pix
+fate-brenderpix-defpal: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/rivrock1.pix -pix_fmt rgb24
FATE_BRENDERPIX += fate-brenderpix-intpal
-fate-brenderpix-intpal: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/testtex.pix
+fate-brenderpix-intpal: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/testtex.pix -pix_fmt rgb24
FATE_BRENDERPIX += fate-brenderpix-y400a
fate-brenderpix-y400a: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/gears.pix
diff --git a/tests/ref/fate/brenderpix-defpal b/tests/ref/fate/brenderpix-defpal
index b80d23dc45..6c55740885 100644
--- a/tests/ref/fate/brenderpix-defpal
+++ b/tests/ref/fate/brenderpix-defpal
@@ -1,2 +1,2 @@
#tb 0: 1/25
-0, 0, 0, 1, 66560, 0xee71bd50
+0, 0, 0, 1, 196608, 0xada11d14
diff --git a/tests/ref/fate/brenderpix-intpal b/tests/ref/fate/brenderpix-intpal
index 776b74b4ef..473b1532ec 100644
--- a/tests/ref/fate/brenderpix-intpal
+++ b/tests/ref/fate/brenderpix-intpal
@@ -1,2 +1,2 @@
#tb 0: 1/25
-0, 0, 0, 1, 66560, 0x51a30b0d
+0, 0, 0, 1, 196608, 0x9662f917