diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 13:25:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 13:34:45 +0100 |
| commit | 99efd596267248ba5eae1b0e540d880368a402c3 (patch) | |
| tree | 1ab9b0250d1350ffaae7d5f2bf98ba78e21d0cf4 /tests | |
| parent | 1fa2bdc90a4a5309a3bf83ff9ae37f59e5f329fa (diff) | |
| parent | cb45553f577f8e0ebfe05d3287e1b6fa5859b967 (diff) | |
| download | ffmpeg-99efd596267248ba5eae1b0e540d880368a402c3.tar.gz | |
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')
| -rw-r--r-- | tests/fate/bmp.mak | 6 | ||||
| -rw-r--r-- | tests/fate/cdxl.mak | 6 | ||||
| -rw-r--r-- | tests/fate/dfa.mak | 6 | ||||
| -rw-r--r-- | tests/fate/mp3.mak | 7 |
4 files changed, 17 insertions, 8 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) diff --git a/tests/fate/cdxl.mak b/tests/fate/cdxl.mak index 86eaa09d0a..2c69e39749 100644 --- a/tests/fate/cdxl.mak +++ b/tests/fate/cdxl.mak @@ -13,5 +13,7 @@ fate-cdxl-pal8-small: CMD = framecrc -i $(SAMPLES)/cdxl/fruit.cdxl -an -pix_fmt FATE_CDXL += fate-cdxl-bitline-ham6 fate-cdxl-bitline-ham6: CMD = framecrc -i $(SAMPLES)/cdxl/bitline.cdxl -frames:v 10 -FATE_SAMPLES_AVCONV += $(FATE_CDXL) -fate-cdxl: $(FATE_CDXL) +FATE_CDXL-$(call DEMDEC, CDXL, CDXL) += $(FATE_CDXL) + +FATE_SAMPLES_AVCONV += $(FATE_CDXL-yes) +fate-cdxl: $(FATE_CDXL-yes) diff --git a/tests/fate/dfa.mak b/tests/fate/dfa.mak index 56f7bfeeb9..4800d8aa90 100644 --- a/tests/fate/dfa.mak +++ b/tests/fate/dfa.mak @@ -31,5 +31,7 @@ fate-dfa10: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0009.dfa -pix_fmt rgb2 FATE_DFA += fate-dfa11 fate-dfa11: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0010.dfa -pix_fmt rgb24 -FATE_SAMPLES_AVCONV += $(FATE_DFA) -fate-dfa: $(FATE_DFA) +FATE_DFA-$(call DEMDEC, DFA, DFA) += $(FATE_DFA) + +FATE_SAMPLES_AVCONV += $(FATE_DFA-yes) +fate-dfa: $(FATE_DFA-yes) diff --git a/tests/fate/mp3.mak b/tests/fate/mp3.mak index 2181fa6a25..1986061c29 100644 --- a/tests/fate/mp3.mak +++ b/tests/fate/mp3.mak @@ -30,11 +30,14 @@ FATE_MP3 += fate-mp3-float-extra_overread fate-mp3-float-extra_overread: CMD = pcm -c:a mp3float -i $(SAMPLES)/mpegaudio/extra_overread.mp3 fate-mp3-float-extra_overread: REF = $(SAMPLES)/mpegaudio/extra_overread.pcm -FATE_SAMPLES_AVCONV += $(FATE_MP3) -fate-mp3: $(FATE_MP3) $(FATE_MP3): CMP = stddev $(FATE_MP3): FUZZ = 0.07 ifdef HAVE_NEON fate-mp3-float-conf-hecommon: FUZZ = 0.70 endif + +FATE_MP3-$(call DEMDEC, MP3, MP3FLOAT) += $(FATE_MP3) + +FATE_SAMPLES_AVCONV += $(FATE_MP3-yes) +fate-mp3: $(FATE_MP3-yes) |