diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-19 00:38:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-19 00:52:25 +0200 |
| commit | 31dfe20dd2fe16c2a3a6816d140b8a32dbdc06ba (patch) | |
| tree | 321a6eb57e018866779df59bc4ef6144d4780a40 /tests/fate | |
| parent | 48a40e09c4858c43627d9bc25efc3c47efdde5af (diff) | |
| parent | 90c9edba58eddf39e77937a6c602d7ff289c9bfd (diff) | |
| download | ffmpeg-31dfe20dd2fe16c2a3a6816d140b8a32dbdc06ba.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: Replace some @file tags by more suitable markup.
fate: Set FUZZ factor of vorbis-13 test to 2.
fate: Set FUZZ factor of (e)ac3-encode test to 3.
fate: remove unused code from regressions-funcs.sh
rtmp: Don't assume path points to a string of nonzero length
avconv: fix behavior with -ss as an output option.
Conflicts:
doc/platform.texi
doc/protocols.texi
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
| -rw-r--r-- | tests/fate/ac3.mak | 2 | ||||
| -rw-r--r-- | tests/fate/vorbis.mak | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/tests/fate/ac3.mak b/tests/fate/ac3.mak index ed2ce12c0e..6db61bd074 100644 --- a/tests/fate/ac3.mak +++ b/tests/fate/ac3.mak @@ -35,6 +35,7 @@ fate-ac3-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav fate-ac3-encode: CMP_SHIFT = -1024 fate-ac3-encode: CMP_TARGET = 399.62 fate-ac3-encode: SIZE_TOLERANCE = 488 +fate-ac3-encode: FUZZ = 3 FATE_AC3 += fate-eac3-encode fate-eac3-encode: CMD = enc_dec_pcm eac3 wav s16le $(REF) -c:a eac3 -b:a 128k @@ -43,6 +44,7 @@ fate-eac3-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav fate-eac3-encode: CMP_SHIFT = -1024 fate-eac3-encode: CMP_TARGET = 514.02 fate-eac3-encode: SIZE_TOLERANCE = 488 +fate-eac3-encode: FUZZ = 3 FATE_AVCONV += $(FATE_AC3) fate-ac3: $(FATE_AC3) diff --git a/tests/fate/vorbis.mak b/tests/fate/vorbis.mak index 25a5d89796..578d7c4871 100644 --- a/tests/fate/vorbis.mak +++ b/tests/fate/vorbis.mak @@ -49,6 +49,7 @@ fate-vorbis-12: REF = $(SAMPLES)/vorbis/mono_small.pcm FATE_VORBIS += fate-vorbis-13 fate-vorbis-13: CMD = pcm -i $(SAMPLES)/vorbis/moog_small.ogg fate-vorbis-13: REF = $(SAMPLES)/vorbis/moog_small.pcm +fate-vorbis-13: FUZZ = 2 FATE_VORBIS += fate-vorbis-14 fate-vorbis-14: CMD = pcm -i $(SAMPLES)/vorbis/rc1-test_small.ogg |