falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Merge commit 'cfb4ee30977732674d30c20e93a761c33c743972' 

* commit 'cfb4ee30977732674d30c20e93a761c33c743972':
  fate: add a pngparser test

Conflicts:
	tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.2-rc1
Michael Niedermayer 11 years ago
parent
b22989da47 cfb4ee3097
commit
682b28b410
2 changed files with 8 additions and 0 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -0
      tests/fate/image.mak
  2. +5
    -0
      tests/ref/fate/pngparser

+ 3
- 0
tests/fate/image.mak View File

@@ -24,6 +24,9 @@ fate-exr: $(FATE_EXR-yes)
FATE_IMAGE-$(call DEMDEC, IMAGE2, PICTOR) += fate-pictor FATE_IMAGE-$(call DEMDEC, IMAGE2, PICTOR) += fate-pictor
fate-pictor: CMD = framecrc -i $(TARGET_SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24 fate-pictor: CMD = framecrc -i $(TARGET_SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24


FATE_IMAGE-$(call PARSERDEMDEC, PNG, IMAGE2PIPE, PNG) += fate-pngparser
fate-pngparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/png1/feed_4x_concat.png

FATE_IMAGE-$(call DEMDEC, IMAGE2, PTX) += fate-ptx FATE_IMAGE-$(call DEMDEC, IMAGE2, PTX) += fate-ptx
fate-ptx: CMD = framecrc -i $(TARGET_SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24 fate-ptx: CMD = framecrc -i $(TARGET_SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24




+ 5
- 0
tests/ref/fate/pngparser View File

@@ -0,0 +1,5 @@
#tb 0: 1/25
0, 0, 0, 1, 1600, 0x01a481a9
0, 1, 1, 1, 1600, 0x01a481a9
0, 2, 2, 1, 1600, 0x01a481a9
0, 3, 3, 1, 1600, 0x01a481a9

Write Preview
Loading…
Cancel
Save