diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-27 10:57:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-27 11:35:03 +0200 |
| commit | 3fa6c992d9c332793cb3012bcfe427861441583b (patch) | |
| tree | c0303290c4dcd1c931c1a1c80a2bbe33f748b2de /tests/fate | |
| parent | 785eb5fc57e006543254d35f5d699eff57a4f681 (diff) | |
| parent | 7c00e9d8aed8511c44281d7b05562578a3fcd4c8 (diff) | |
| download | ffmpeg-3fa6c992d9c332793cb3012bcfe427861441583b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: ac3dsp: Remove 3dnow version of ff_ac3_extract_exponents
Conflicts:
tests/fate/ac3.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
| -rw-r--r-- | tests/fate/ac3.mak | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/fate/ac3.mak b/tests/fate/ac3.mak index 90dfc411f2..cc14c2ac17 100644 --- a/tests/fate/ac3.mak +++ b/tests/fate/ac3.mak @@ -52,14 +52,13 @@ fate-ac3-encode: CMD = enc_dec_pcm ac3 wav s16le $(REF) -c:a ac3 -b:a 128k fate-ac3-encode: CMP_SHIFT = -1024 fate-ac3-encode: CMP_TARGET = 404.53 fate-ac3-encode: SIZE_TOLERANCE = 488 -fate-ac3-encode: FUZZ = 4 + FATE_EAC3-$(call ENCDEC, EAC3, EAC3) += fate-eac3-encode fate-eac3-encode: CMD = enc_dec_pcm eac3 wav s16le $(REF) -c:a eac3 -b:a 128k fate-eac3-encode: CMP_SHIFT = -1024 fate-eac3-encode: CMP_TARGET = 516.94 fate-eac3-encode: SIZE_TOLERANCE = 488 -fate-eac3-encode: FUZZ = 3 fate-ac3-encode fate-eac3-encode: CMP = stddev fate-ac3-encode fate-eac3-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav |