RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-12 10:29:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '3e4e2142d246699a1a3a0045ba7124b18bc34d7a'

Browse Source 
* commit '3e4e2142d246699a1a3a0045ba7124b18bc34d7a':
  fate: Convert the paletted output in the brenderpix tests to rgb24

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-31 01:31:50 +02:00
commit 8e8276e0bc
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/fate/image.mak
View File

@ -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

2
tests/ref/fate/brenderpix-defpal
View File

@ -1,2 +1,2 @@
#tb 0: 1/25
0, 0, 0, 1, 66560, 0xee71bd50
0, 0, 0, 1, 196608, 0xada11d14

2
tests/ref/fate/brenderpix-intpal
View File

@ -1,2 +1,2 @@
#tb 0: 1/25
0, 0, 0, 1, 66560, 0x51a30b0d
0, 0, 0, 1, 196608, 0x9662f917