diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-20 00:25:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-20 10:21:52 +0200 |
| commit | 31f3c94760b42e16e998dcc0b34e677d1aa431bc (patch) | |
| tree | 8a6033e5163bd038ea8ba5629233e7567e57d4ae /tests/fate/ea.mak | |
| parent | d1384c00d4882712816612d82289be240c508779 (diff) | |
| parent | 63dcd16d567862d94fe4b178e47f440e8ad6a2c9 (diff) | |
| download | ffmpeg-streaming-31f3c94760b42e16e998dcc0b34e677d1aa431bc.zip ffmpeg-streaming-31f3c94760b42e16e998dcc0b34e677d1aa431bc.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: fix dependencies on SAMPLES being set
fate: remove unnecessary libavfilter dependency
Conflicts:
ffmpeg.c
tests/Makefile
tests/fate/aac.mak
tests/fate/audio.mak
tests/fate/demux.mak
tests/fate/ea.mak
tests/fate/image.mak
tests/fate/lossless-audio.mak
tests/fate/lossless-video.mak
tests/fate/microsoft.mak
tests/fate/mpc.mak
tests/fate/probe.mak
tests/fate/qt.mak
tests/fate/real.mak
tests/fate/screen.mak
tests/fate/video.mak
tests/fate/voice.mak
tests/fate/vqf.mak
tests/ref/fate/idroq-video-encode
tests/ref/fate/vc1-ism
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/ea.mak')
| -rw-r--r-- | tests/fate/ea.mak | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/fate/ea.mak b/tests/fate/ea.mak index b0636fe..2f7f2ad 100644 --- a/tests/fate/ea.mak +++ b/tests/fate/ea.mak @@ -1,23 +1,23 @@ -FATE_EA += fate-ea-cdata +FATE_SAMPLES_EA += fate-ea-cdata fate-ea-cdata: CMD = md5 -i $(SAMPLES)/ea-cdata/166b084d.46410f77.0009b440.24be960c.cdata -f s16le -FATE_EA += fate-ea-cmv +FATE_SAMPLES_EA += fate-ea-cmv fate-ea-cmv: CMD = framecrc -i $(SAMPLES)/ea-cmv/TITLE.CMV -pix_fmt rgb24 -FATE_EA += fate-ea-tgq +FATE_SAMPLES_EA += fate-ea-tgq fate-ea-tgq: CMD = framecrc -i $(SAMPLES)/ea-tgq/v27.tgq -an -FATE_EA += fate-ea-tqi +FATE_SAMPLES_EA += fate-ea-tqi fate-ea-tqi: CMD = framecrc -i $(SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:v 26 -an -FATE_EA += fate-ea-mad +FATE_SAMPLES_EA += fate-ea-mad fate-ea-mad: CMD = framecrc -i $(SAMPLES)/ea-mad/NFS6LogoE.mad -an -FATE_EA += fate-ea-tgv-1 +FATE_SAMPLES_EA += fate-ea-tgv-1 fate-ea-tgv-1: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTRO8K-partial.TGV -pix_fmt rgb24 -an -FATE_EA += fate-ea-tgv-2 +FATE_SAMPLES_EA += fate-ea-tgv-2 fate-ea-tgv-2: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTEL_S.TGV -pix_fmt rgb24 -an -FATE_FFMPEG += $(FATE_EA) -fate-ea: $(FATE_EA) +FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_EA) +fate-ea: $(FATE_SAMPLES_EA) |
