Merge commit '3e4e2142d246699a1a3a0045ba7124b18bc34d7a'

* commit '3e4e2142d246699a1a3a0045ba7124b18bc34d7a': fate: Convert the paletted output in the brenderpix tests to rgb24 Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 8e8276e0bc
parent 0f2588d7e5 3e4e2142d2
commit 8e8276e0bc
3 changed files with 4 additions and 4 deletions
--- 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
--- 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
--- 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