diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-25 00:38:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-25 00:38:16 +0200 |
| commit | 65e63072f81641f50e5775be5c3b2873e8d6f38e (patch) | |
| tree | 766617aff5fadbb6bee949ee7669c9431d00a374 /tests/fate/audio.mak | |
| parent | ba4aa656ce1c4e530bec4ed1b0fcf67eb20283f0 (diff) | |
| parent | a4d3f3580bd993f4e8f4abc9c4ad486cb1c51987 (diff) | |
| download | ffmpeg-65e63072f81641f50e5775be5c3b2873e8d6f38e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmp: Return a proper error code instead of -1
rtmp: Check malloc calls
rtmp: Check ff_rtmp_packet_create calls
lavfi: add audio mix filter
flvdec: Make sure sample_rate is set to the updated value
tqi: Pass errors from the MB decoder
Conflicts:
Changelog
doc/filters.texi
libavcodec/eatqi.c
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/audio.mak')
| -rw-r--r-- | tests/fate/audio.mak | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak index 5cf457ef34..d741faddb2 100644 --- a/tests/fate/audio.mak +++ b/tests/fate/audio.mak @@ -39,8 +39,8 @@ fate-nellymoser-aref-encode: $(AREF) fate-nellymoser-aref-encode: CMD = enc_dec_pcm flv wav s16le $(REF) -c:a nellymoser fate-nellymoser-aref-encode: CMP = stddev fate-nellymoser-aref-encode: REF = ./tests/data/acodec-16000-1.ref.wav -fate-nellymoser-aref-encode: CMP_SHIFT = -1172 -fate-nellymoser-aref-encode: CMP_TARGET = 9617 +fate-nellymoser-aref-encode: CMP_SHIFT = -244 +fate-nellymoser-aref-encode: CMP_TARGET = 9612 fate-nellymoser-aref-encode: SIZE_TOLERANCE = 268 FATE_SAMPLES_AUDIO += fate-sierra-vmd-audio |