diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-29 14:16:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-29 14:16:46 +0100 |
| commit | 9f8e2e92ae88841709ae1ffe71572ef7e5e865c7 (patch) | |
| tree | d7343c8a8eee0a42ae4c6bcc0ee6105ebacaa3d9 /tests | |
| parent | 52066bdb300b3a2cdef48897d0c864410b259084 (diff) | |
| parent | e4d349b4014ee2a03f521027e0bd1ace4a9e60bd (diff) | |
Merge commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd'
* commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd':
fate: h264: Add dependencies
fate: ea: Add dependencies
fate: Do not unconditionally run libavutil tests
rtpenc_chain: Remove unused variable
nuv: check for malloc failure when allocating extradata
nuv: use the stream indices generated by avformat_new_stream()
Conflicts:
tests/fate/ea.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 1 | ||||
| -rw-r--r-- | tests/fate/ea.mak | 21 | ||||
| -rw-r--r-- | tests/fate/h264.mak | 10 | ||||
| -rw-r--r-- | tests/fate/libavutil.mak | 1 |
4 files changed, 19 insertions, 14 deletions
diff --git a/tests/Makefile b/tests/Makefile index da7fdc169b..dfb12b0e11 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -124,7 +124,6 @@ FATE_EXTERN-$(CONFIG_FFMPEG) += $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG) $ FATE_EXTERN += $(FATE_EXTERN-yes) FATE += $(FATE-yes) -FATE += $(FATE_LIBAVUTIL) $(FATE_FFMPEG) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG): ffmpeg$(EXESUF) diff --git a/tests/fate/ea.mak b/tests/fate/ea.mak index 2f7f2ad059..eb757085d7 100644 --- a/tests/fate/ea.mak +++ b/tests/fate/ea.mak @@ -1,23 +1,26 @@ -FATE_SAMPLES_EA += fate-ea-cdata +FATE_SAMPLES_EA-$(call DEMDEC, EA_CDATA, ADPCM_EA_XAS) += fate-ea-cdata fate-ea-cdata: CMD = md5 -i $(SAMPLES)/ea-cdata/166b084d.46410f77.0009b440.24be960c.cdata -f s16le -FATE_SAMPLES_EA += fate-ea-cmv +FATE_SAMPLES_EA-$(call DEMDEC, EA, EACMV) += fate-ea-cmv fate-ea-cmv: CMD = framecrc -i $(SAMPLES)/ea-cmv/TITLE.CMV -pix_fmt rgb24 -FATE_SAMPLES_EA += fate-ea-tgq +FATE_SAMPLES_EA-$(call DEMDEC, EA, EATGQ) += fate-ea-tgq fate-ea-tgq: CMD = framecrc -i $(SAMPLES)/ea-tgq/v27.tgq -an -FATE_SAMPLES_EA += fate-ea-tqi +FATE_SAMPLES_EA-$(call DEMDEC, EA, EATQI) += fate-ea-tqi fate-ea-tqi: CMD = framecrc -i $(SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:v 26 -an -FATE_SAMPLES_EA += fate-ea-mad +FATE_SAMPLES_EA-$(call DEMDEC, EA, EAMAD) += fate-ea-mad fate-ea-mad: CMD = framecrc -i $(SAMPLES)/ea-mad/NFS6LogoE.mad -an -FATE_SAMPLES_EA += fate-ea-tgv-1 +FATE_EA_TGV += fate-ea-tgv-1 fate-ea-tgv-1: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTRO8K-partial.TGV -pix_fmt rgb24 -an -FATE_SAMPLES_EA += fate-ea-tgv-2 +FATE_EA_TGV += fate-ea-tgv-2 fate-ea-tgv-2: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTEL_S.TGV -pix_fmt rgb24 -an -FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_EA) -fate-ea: $(FATE_SAMPLES_EA) +FATE_SAMPLES_EA-$(call DEMDEC, EA, EATGV) += $(FATE_EA_TGV) +fate-ea-tgv: $(FATE_EA_TGV) + +FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_EA-yes) +fate-ea: $(FATE_SAMPLES_EA-yes) diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak index 113f9ca357..75fd58c21a 100644 --- a/tests/fate/h264.mak +++ b/tests/fate/h264.mak @@ -183,13 +183,15 @@ FATE_H264 = aud_mw_e \ sva_nl2_e \ FATE_H264 := $(FATE_H264:%=fate-h264-conformance-%) \ - fate-h264-interlace-crop \ fate-h264-lossless \ fate-h264-extreme-plane-pred \ - fate-h264-bsf-mp4toannexb \ -FATE_SAMPLES_AVCONV += $(FATE_H264) -fate-h264: $(FATE_H264) +FATE_H264-$(call DEMDEC, H264, H264) += $(FATE_H264) +FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-interlace-crop +FATE_H264-$(call ALLYES, MOV_DEMUXER H264_MP4TOANNEXB_BSF) += fate-h264-bsf-mp4toannexb + +FATE_SAMPLES_AVCONV += $(FATE_H264-yes) +fate-h264: $(FATE_H264-yes) fate-h264-conformance-aud_mw_e: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/AUD_MW_E.264 fate-h264-conformance-ba1_ft_c: CMD = framecrc -vsync drop -i $(SAMPLES)/h264-conformance/BA1_FT_C.264 diff --git a/tests/fate/libavutil.mak b/tests/fate/libavutil.mak index f62e8447aa..b2484a57f9 100644 --- a/tests/fate/libavutil.mak +++ b/tests/fate/libavutil.mak @@ -61,4 +61,5 @@ FATE_LIBAVUTIL += fate-xtea fate-xtea: libavutil/xtea-test$(EXESUF) fate-xtea: CMD = run libavutil/xtea-test +FATE-$(CONFIG_AVUTIL) += $(FATE_LIBAVUTIL) fate-libavutil: $(FATE_LIBAVUTIL) |