Merge commit '364af376f343d4706c4cdb7ab9fe0863994e6c01'

* commit '364af376f343d4706c4cdb7ab9fe0863994e6c01':
  FATE: add lavr resampling tests

The tests do not pass, and thus where disabled

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

diff --cc tests/fate/libavresample.mak
index 66ca669,516c6e6..d7dd2ce
--- 1/tests/fate/libavresample.mak
--- 2/tests/fate/libavresample.mak
+++ b/tests/fate/libavresample.mak
@@@ -20,7 -20,26 +20,26 @@@ $(call CROSS_TEST,$(MIX_CHANNELS),MIX,f
  
  FATE_LAVR_MIX-$(call FILTERDEMDECENCMUX, RESAMPLE, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_LAVR_MIX)
  fate-lavr-mix: $(FATE_LAVR_MIX-yes)
 -FATE_LAVR += $(FATE_LAVR_MIX-yes)
 +#FATE_LAVR += $(FATE_LAVR_MIX-yes)
  
 -fate-lavr-resample-$(3)-$(1)-$(2): CMD = avconv -i $(TARGET_PATH)/tests/data/asynth-$(1)-1.wav -ar $(2) -internal_sample_fmt $(3) -f $(4) -af atrim=end_sample=10240 -
+ SAMPLERATES = 2626 8000 44100 48000 96000
+ 
+ define RESAMPLE
+ FATE_LAVR_RESAMPLE += fate-lavr-resample-$(3)-$(1)-$(2)
+ fate-lavr-resample-$(3)-$(1)-$(2): tests/data/asynth-$(1)-1.wav
 -FATE_LAVR += $(FATE_LAVR_RESAMPLE-yes)
++fate-lavr-resample-$(3)-$(1)-$(2): CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asynth-$(1)-1.wav -ar $(2) -internal_sample_fmt $(3) -f $(4) -af atrim=end_sample=10240 -
+ fate-lavr-resample-$(3)-$(1)-$(2): CMP = oneoff
+ fate-lavr-resample-$(3)-$(1)-$(2): REF = $(SAMPLES)/lavr/lavr-resample-$(3)-$(1)-$(2)
+ endef
+ 
+ $(call CROSS_TEST,$(SAMPLERATES),RESAMPLE,s16p,s16le)
+ $(call CROSS_TEST,$(SAMPLERATES),RESAMPLE,s32p,s32le)
+ $(call CROSS_TEST,$(SAMPLERATES),RESAMPLE,fltp,f32le)
+ $(call CROSS_TEST,$(SAMPLERATES),RESAMPLE,dblp,f64le)
+ 
+ FATE_LAVR_RESAMPLE-$(call FILTERDEMDECENCMUX, RESAMPLE, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_LAVR_RESAMPLE)
+ fate-lavr-resample: $(FATE_LAVR_RESAMPLE-yes)
++#FATE_LAVR += $(FATE_LAVR_RESAMPLE-yes)
+ 
  FATE_SAMPLES_AVCONV += $(FATE_LAVR)
  fate-lavr: $(FATE_LAVR)