diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-19 11:06:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-19 11:06:39 +0200 |
| commit | 0a8e86faf24f6a23d54be5a4fdd1ce0cd077d3e5 (patch) | |
| tree | 9a71f4795144875c97182575679480673b1a75cb /tests/fate/video.mak | |
| parent | fa6001e7281d2bcc09c5f2eb66263ddc56f10799 (diff) | |
| parent | e45d6222cc925f491a83f82d37c3b02fa69b8e02 (diff) | |
| download | ffmpeg-0a8e86faf24f6a23d54be5a4fdd1ce0cd077d3e5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Escape 130 FATE test
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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 7e3c97b410..ca0789bef6 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -25,6 +25,9 @@ fate-ansi256: CMD = framecrc -chars_per_frame 44100 -i $(SAMPLES)/ansi/ansi256.a FATE_VIDEO-$(call DEMDEC, RPL, ESCAPE124) += fate-armovie-escape124 fate-armovie-escape124: CMD = framecrc -i $(SAMPLES)/rpl/ESCAPE.RPL -pix_fmt rgb24 +FATE_VIDEO-$(call DEMDEC, RPL, ESCAPE130) += fate-armovie-escape130 +fate-armovie-escape130: CMD = framecrc -i $(SAMPLES)/rpl/landing.rpl -an + FATE_VIDEO-$(call DEMDEC, AVI, AURA) += fate-auravision-v1 fate-auravision-v1: CMD = framecrc -i $(SAMPLES)/auravision/SOUVIDEO.AVI -an |