Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: Increase the tolerance in the lavr tests

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

diff --cc tests/fate/libavresample.mak
index 48a81d06e0c97284c71c62c3b6251be25492665e,6ae2ddcac60d9d056bc624cc8cabb4ed17fc9c47..d7c856ba43a97e1f44eda14f0536bf951204069f
--- 1/tests/fate/libavresample.mak
--- 2/tests/fate/libavresample.mak
+++ b/tests/fate/libavresample.mak
@@@ -27,10 -27,10 +27,10 @@@ SAMPLERATES = 2626 8000 44100 48000 960
  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-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 -
 +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): CMP_UNIT = $(5)
- fate-lavr-resample-$(3)-$(1)-$(2): FUZZ = 4
+ fate-lavr-resample-$(3)-$(1)-$(2): FUZZ = 6
  fate-lavr-resample-$(3)-$(1)-$(2): REF = $(SAMPLES)/lavr/lavr-resample-$(3)-$(1)-$(2)
  endef