diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-28 05:49:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-28 05:50:38 +0100 |
| commit | 2b570c9569a2c8858f5f5f198efcf7000cfc4738 (patch) | |
| tree | 53e1dabbb3eb3793278b956bb95a687e7d40bd81 /tests/fate/image.mak | |
| parent | 1da186676738dbded75a83d72f0739b993970d4e (diff) | |
| parent | 991362fab49b60d34d89b7b7d6dd00fbec3ce022 (diff) | |
| download | ffmpeg-streaming-2b570c9569a2c8858f5f5f198efcf7000cfc4738.zip ffmpeg-streaming-2b570c9569a2c8858f5f5f198efcf7000cfc4738.tar.gz | |
Merge commit '991362fab49b60d34d89b7b7d6dd00fbec3ce022'
* commit '991362fab49b60d34d89b7b7d6dd00fbec3ce022':
fate: add XBM tests
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/image.mak')
| -rw-r--r-- | tests/fate/image.mak | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 36e127b..6b17321 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -131,6 +131,16 @@ fate-tiff: $(FATE_TIFF-yes) FATE_IMAGE-$(call DEMDEC, IMAGE2, XFACE) += fate-xface fate-xface: CMD = framecrc -i $(TARGET_SAMPLES)/xface/lena.xface +FATE_XBM += fate-xbm10 +fate-xbm10: CMD = framecrc -i $(TARGET_SAMPLES)/xbm/xl.xbm + +FATE_XBM += fate-xbm11 +fate-xbm11: CMD = framecrc -i $(TARGET_SAMPLES)/xbm/lbw.xbm + +FATE_XBM-$(call DEMDEC, IMAGE2, XBM) += $(FATE_XBM) +FATE_IMAGE += $(FATE_XBM-yes) +fate-xbm: $(FATE_XBM-yes) + FATE_IMAGE += $(FATE_IMAGE-yes) FATE_SAMPLES_FFMPEG += $(FATE_IMAGE) |
