diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-27 01:59:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-27 01:59:32 +0100 |
| commit | 62094e2fddf53f608bc42f54ae50979ec8eb2b84 (patch) | |
| tree | 7e0919b560b44a55281d7a1a53a0af580273241f | |
| parent | 12ab07be447264b107b18bc49bb9e06be072330f (diff) | |
| parent | 9718c31ef60c6aced1fcfab788edb7ca8b6719ee (diff) | |
| download | ffmpeg-62094e2fddf53f608bc42f54ae50979ec8eb2b84.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: add Alias PIX tests
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | tests/fate/image.mak | 9 | ||||
| -rw-r--r-- | tests/ref/fate/aliaspix-bgr | 2 | ||||
| -rw-r--r-- | tests/ref/fate/aliaspix-gray | 2 |
3 files changed, 13 insertions, 0 deletions
diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 7c2ac10841..a9713647ec 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -1,3 +1,12 @@ +FATE_ALIASPIX += fate-aliaspix-bgr +fate-aliaspix-bgr: CMD = framecrc -i $(TARGET_SAMPLES)/aliaspix/first.pix -pix_fmt bgr24 + +FATE_ALIASPIX += fate-aliaspix-gray +fate-aliaspix-gray: CMD = framecrc -i $(TARGET_SAMPLES)/aliaspix/firstgray.pix -pix_fmt gray + +FATE_ALIASPIX-$(call DEMDEC, IMAGE2, ALIAS_PIX) += $(FATE_ALIASPIX) +FATE_IMAGE += $(FATE_ALIASPIX-yes) +fate-aliaspix: $(FATE_ALIASPIX-yes) FATE_IMAGE-$(call DEMDEC, IMAGE2, DPX) += fate-dpx fate-dpx: CMD = framecrc -i $(TARGET_SAMPLES)/dpx/lighthouse_rgb48.dpx diff --git a/tests/ref/fate/aliaspix-bgr b/tests/ref/fate/aliaspix-bgr new file mode 100644 index 0000000000..235a5acf69 --- /dev/null +++ b/tests/ref/fate/aliaspix-bgr @@ -0,0 +1,2 @@ +#tb 0: 1/25 +0, 0, 0, 1, 36000, 0x9ff1ba55 diff --git a/tests/ref/fate/aliaspix-gray b/tests/ref/fate/aliaspix-gray new file mode 100644 index 0000000000..74cf6a20bc --- /dev/null +++ b/tests/ref/fate/aliaspix-gray @@ -0,0 +1,2 @@ +#tb 0: 1/25 +0, 0, 0, 1, 12000, 0x29f8832c |