diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 16:25:23 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 16:34:45 +0400 |
| commit | 99efd596267248ba5eae1b0e540d880368a402c3 (patch) | |
| tree | 1ab9b0250d1350ffaae7d5f2bf98ba78e21d0cf4 /tests/fate/bmp.mak | |
| parent | 1fa2bdc90a4a5309a3bf83ff9ae37f59e5f329fa (diff) | |
| parent | cb45553f577f8e0ebfe05d3287e1b6fa5859b967 (diff) | |
Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'
* commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967':
Remove pointless #undefs of previously forbidden functions.
fate: Add dependencies for bmp, cdxl, dfa, mp3
Conflicts:
doc/examples/muxing.c
libavfilter/filtfmts.c
libavutil/des.c
libavutil/eval.c
libavutil/log.c
libavutil/parseutils.c
tests/fate/mp3.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/bmp.mak')
| -rw-r--r-- | tests/fate/bmp.mak | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/fate/bmp.mak b/tests/fate/bmp.mak index c6601902f5..9e52ac081f 100644 --- a/tests/fate/bmp.mak +++ b/tests/fate/bmp.mak @@ -37,5 +37,7 @@ fate-bmp-rle4: CMD = framecrc -i $(SAMPLES)/bmp/testcompress4.bmp -pix_fmt rgb24 FATE_BMP += fate-bmp-rle8 fate-bmp-rle8: CMD = framecrc -i $(SAMPLES)/bmp/testcompress8.bmp -pix_fmt rgb24 -FATE_SAMPLES_AVCONV += $(FATE_BMP) -fate-bmp: $(FATE_BMP) +FATE_BMP-$(call DEMDEC, IMAGE2, BMP) += $(FATE_BMP) + +FATE_SAMPLES_AVCONV += $(FATE_BMP-yes) +fate-bmp: $(FATE_BMP-yes) |