Merge commit 'b727b0eeb73cd78533a7fd387ceccd505e48fa6c'

* commit 'b727b0eeb73cd78533a7fd387ceccd505e48fa6c':
  fate: Add tests for DSS

Conflicts:
	tests/fate/audio.mak

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

diff --cc tests/fate/audio.mak
index b7e5362,397b4ec..da6f0bb
--- 1/tests/fate/audio.mak
--- 2/tests/fate/audio.mak
+++ b/tests/fate/audio.mak
@@@ -10,16 -10,20 +10,20 @@@ fate-binkaudio-rdft: FUZZ = 
  
  $(FATE_BINKAUDIO-yes): CMP = oneoff
  
 -FATE_SAMPLES_AVCONV += $(FATE_BINKAUDIO-yes)
 +FATE_SAMPLES_AUDIO += $(FATE_BINKAUDIO-yes)
  fate-binkaudio: $(FATE_BINKAUDIO-yes)
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, BMV, BMV_AUDIO) += fate-bmv-audio
 +FATE_SAMPLES_AUDIO-$(call DEMDEC, BMV, BMV_AUDIO) += fate-bmv-audio
  fate-bmv-audio: CMD = framecrc -i $(TARGET_SAMPLES)/bmv/SURFING-partial.BMV -vn
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, DSICIN, DSICINAUDIO) += fate-delphine-cin-audio
 +FATE_SAMPLES_AUDIO-$(call DEMDEC, DSICIN, DSICINAUDIO) += fate-delphine-cin-audio
  fate-delphine-cin-audio: CMD = framecrc -i $(TARGET_SAMPLES)/delphine-cin/LOGO-partial.CIN -vn
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, DSS, DSS_SP) += fate-dss-lp fate-dss-sp
++FATE_SAMPLES_AUDIO-$(call DEMDEC, DSS, DSS_SP) += fate-dss-lp fate-dss-sp
+ fate-dss-lp: CMD = framecrc -i $(TARGET_SAMPLES)/dss/lp.dss -frames 30
+ fate-dss-sp: CMD = framecrc -i $(TARGET_SAMPLES)/dss/sp.dss -frames 30
+ 
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, MPEGTS, DCA) += fate-dts
 +FATE_SAMPLES_AUDIO-$(call DEMDEC, MPEGTS, DCA) += fate-dts
  fate-dts: CMD = pcm -i $(TARGET_SAMPLES)/dts/dts.ts
  fate-dts: CMP = oneoff
  fate-dts: REF = $(SAMPLES)/dts/dts.pcm