Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-12-17 21:16:26 +0400
committerMichael Niedermayer <michaelni@gmx.at>2013-12-17 21:55:15 +0400
commit682b28b41098f4445581076c44fb8420306eacec (patch)
treedfeae00ab8798516814a193c484d4c6c3662a811 /tests/fate
parentb22989da47beaa65d855d42bedf5e9961b84d983 (diff)
parentcfb4ee30977732674d30c20e93a761c33c743972 (diff)
Merge commit 'cfb4ee30977732674d30c20e93a761c33c743972'
* commit 'cfb4ee30977732674d30c20e93a761c33c743972': fate: add a pngparser test Conflicts: tests/fate/image.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
-rw-r--r--tests/fate/image.mak3
1 files changed, 3 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