diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-17 13:06:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-17 13:06:12 +0100 |
| commit | 130dc9518779eb1b389d0cdf7348802e2b25f201 (patch) | |
| tree | 32686c5b876b16dab4125d6667bb0d80096d70b9 /tests/fate/video.mak | |
| parent | abf91f7fee326fae0d70ca1a481c51e8eab1dd5e (diff) | |
| parent | da5408ede972ab474f7df9023471a7bcd7092abb (diff) | |
| download | ffmpeg-130dc9518779eb1b389d0cdf7348802e2b25f201.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: add a bink version 'b' test
FATE: add a bink version 'i' test
libswscale: remove unnecessary direct #if LIBSWSCALE_VERSION_MAJOR
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/video.mak')
| -rw-r--r-- | tests/fate/video.mak | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 93f6a0f778..5689f51de9 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -37,8 +37,16 @@ fate-bethsoft-vid: CMD = framecrc -i $(SAMPLES)/bethsoft-vid/ANIM0001.VID -t 5 - FATE_VIDEO-$(call DEMDEC, BFI, BFI) += fate-bfi fate-bfi: CMD = framecrc -i $(SAMPLES)/bfi/2287.bfi -pix_fmt rgb24 -FATE_VIDEO-$(call DEMDEC, BINK, BINK) += fate-bink-video -fate-bink-video: CMD = framecrc -i $(SAMPLES)/bink/hol2br.bik +FATE_BINK_VIDEO += fate-bink-video-b +fate-bink-video-b: CMD = framecrc -i $(SAMPLES)/bink/RISE.BIK -frames 30 + +FATE_BINK_VIDEO += fate-bink-video-f +fate-bink-video-f: CMD = framecrc -i $(SAMPLES)/bink/hol2br.bik + +FATE_BINK_VIDEO += fate-bink-video-i +fate-bink-video-i: CMD = framecrc -i $(SAMPLES)/bink/RazOnBull.bik -an + +FATE_VIDEO-$(call DEMDEC, BINK, BINK) += $(FATE_BINK_VIDEO) FATE_VIDEO-$(call DEMDEC, BMV, BMV_VIDEO) += fate-bmv-video fate-bmv-video: CMD = framecrc -i $(SAMPLES)/bmv/SURFING-partial.BMV -pix_fmt rgb24 -an |