Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Escape 130 FATE test

Conflicts:
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc tests/fate/video.mak
index 7e3c97b,998bf35..ca0789b
--- 1/tests/fate/video.mak
--- 2/tests/fate/video.mak
+++ b/tests/fate/video.mak
@@@ -4,37 -4,37 +4,40 @@@ fate-4xm-1: CMD = framecrc -i $(SAMPLES
  FATE_4XM += fate-4xm-2
  fate-4xm-2: CMD = framecrc -i $(SAMPLES)/4xm/version2.4xm -pix_fmt rgb24 -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, FOURXM, FOURXM) += $(FATE_4XM)
 +FATE_VIDEO-$(call DEMDEC, FOURXM, FOURXM) += $(FATE_4XM)
  fate-4xm: $(FATE_4XM)
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, AASC) += fate-aasc
 +FATE_VIDEO-$(call DEMDEC, AVI, AASC) += fate-aasc
  fate-aasc: CMD = framecrc -i $(SAMPLES)/aasc/AASC-1.5MB.AVI -pix_fmt rgb24
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, MM, MMVIDEO) += fate-alg-mm
 +FATE_VIDEO-$(call DEMDEC, MM, MMVIDEO) += fate-alg-mm
  fate-alg-mm: CMD = framecrc -i $(SAMPLES)/alg-mm/ibmlogo.mm -an -pix_fmt rgb24
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, AMV) += fate-amv
 +FATE_VIDEO-$(call DEMDEC, AVI, AMV) += fate-amv
  fate-amv: CMD = framecrc -idct simple -i $(SAMPLES)/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv -t 10 -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, TTY, ANSI) += fate-ansi
 +FATE_VIDEO-$(call DEMDEC, TTY, ANSI) += fate-ansi
  fate-ansi: CMD = framecrc -chars_per_frame 44100 -i $(SAMPLES)/ansi/TRE-IOM5.ANS -pix_fmt rgb24
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, RPL, ESCAPE124) += fate-armovie-escape124
 +FATE_VIDEO-$(call DEMDEC, TTY, ANSI) += fate-ansi256
 +fate-ansi256: CMD = framecrc -chars_per_frame 44100 -i $(SAMPLES)/ansi/ansi256.ans -pix_fmt rgb24
 +
 +FATE_VIDEO-$(call DEMDEC, RPL, ESCAPE124) += fate-armovie-escape124
  fate-armovie-escape124: CMD = framecrc -i $(SAMPLES)/rpl/ESCAPE.RPL -pix_fmt rgb24
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, RPL, ESCAPE130) += fate-armovie-escape130
++FATE_VIDEO-$(call DEMDEC, RPL, ESCAPE130) += fate-armovie-escape130
+ fate-armovie-escape130: CMD = framecrc -i $(SAMPLES)/rpl/landing.rpl -an
+ 
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, AURA) += fate-auravision-v1
 +FATE_VIDEO-$(call DEMDEC, AVI, AURA) += fate-auravision-v1
  fate-auravision-v1: CMD = framecrc -i $(SAMPLES)/auravision/SOUVIDEO.AVI -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, AURA2) += fate-auravision-v2
 +FATE_VIDEO-$(call DEMDEC, AVI, AURA2) += fate-auravision-v2
  fate-auravision-v2: CMD = framecrc -i $(SAMPLES)/auravision/salma-hayek-in-ugly-betty-partial-avi -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, BETHSOFTVID, BETHSOFTVID) += fate-bethsoft-vid
 +FATE_VIDEO-$(call DEMDEC, BETHSOFTVID, BETHSOFTVID) += fate-bethsoft-vid
  fate-bethsoft-vid: CMD = framecrc -i $(SAMPLES)/bethsoft-vid/ANIM0001.VID -t 5 -pix_fmt rgb24
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, BFI, BFI) += fate-bfi
 +FATE_VIDEO-$(call DEMDEC, BFI, BFI) += fate-bfi
  fate-bfi: CMD = framecrc -i $(SAMPLES)/bfi/2287.bfi -pix_fmt rgb24
  
  FATE_BINK_VIDEO += fate-bink-video-b