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/fate/h264.mak | |
| 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/fate/h264.mak')
| -rw-r--r-- | tests/fate/h264.mak | 10 |
1 files changed, 6 insertions, 4 deletions
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 |