diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-17 18:16:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-17 18:55:15 +0100 |
| commit | 682b28b41098f4445581076c44fb8420306eacec (patch) | |
| tree | dfeae00ab8798516814a193c484d4c6c3662a811 | |
| parent | b22989da47beaa65d855d42bedf5e9961b84d983 (diff) | |
| parent | cfb4ee30977732674d30c20e93a761c33c743972 (diff) | |
| download | ffmpeg-682b28b41098f4445581076c44fb8420306eacec.tar.gz | |
Merge commit 'cfb4ee30977732674d30c20e93a761c33c743972'
* commit 'cfb4ee30977732674d30c20e93a761c33c743972':
fate: add a pngparser test
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | tests/fate/image.mak | 3 | ||||
| -rw-r--r-- | tests/ref/fate/pngparser | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 926d637dad..ce32b36bc1 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -24,6 +24,9 @@ fate-exr: $(FATE_EXR-yes) FATE_IMAGE-$(call DEMDEC, IMAGE2, PICTOR) += fate-pictor 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-ptx: CMD = framecrc -i $(TARGET_SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24 diff --git a/tests/ref/fate/pngparser b/tests/ref/fate/pngparser new file mode 100644 index 0000000000..93005cff83 --- /dev/null +++ b/tests/ref/fate/pngparser @@ -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 |