diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-30 01:39:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-30 01:40:54 +0200 |
| commit | b0387edd5e766b1032f946d6cdb35b765bb45435 (patch) | |
| tree | dd3ca8577a8d3b05efee8b1214a80f845ddeb47f /tests/fate/aac.mak | |
| parent | 8619362ff1de6605ffe6da8a42bdfe4fb7be75c1 (diff) | |
| parent | f919cc7df6ab844bc12f89fe7bef4fb915a47725 (diff) | |
| download | ffmpeg-streaming-b0387edd5e766b1032f946d6cdb35b765bb45435.zip ffmpeg-streaming-b0387edd5e766b1032f946d6cdb35b765bb45435.tar.gz | |
Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'
* commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725':
fate: fix acodec/vsynth tests for make 3.81
pcm_mpeg: fix number of consumed bytes to include the header.
avfilter: include required header file avfilter.h in video.h
x86: Avoid movs on BUTTERFLYPS when in AVX mode
x86: use new schema for ASM macros
fate: convert codec-regression.sh to makefile rules
fate: allow tests to specify unit size for psnr comparison
fate: teach videogen/rotozoom to output a single raw video stream
http: Add support for reusing the http socket for subsequent requests
http: Add support for using persistent connections
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/aac.mak')
| -rw-r--r-- | tests/fate/aac.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak index 314bc82..673dbf2 100644 --- a/tests/fate/aac.mak +++ b/tests/fate/aac.mak @@ -75,7 +75,7 @@ FATE_AAC_ENCODE += fate-aac-aref-encode fate-aac-aref-encode: $(AREF) fate-aac-aref-encode: CMD = enc_dec_pcm adts wav s16le $(REF) -strict -2 -c:a aac -b:a 512k fate-aac-aref-encode: CMP = stddev -fate-aac-aref-encode: REF = ./tests/data/acodec.ref.wav +fate-aac-aref-encode: REF = ./tests/data/asynth-44100-2.wav fate-aac-aref-encode: CMP_SHIFT = -4096 fate-aac-aref-encode: CMP_TARGET = 1862 fate-aac-aref-encode: SIZE_TOLERANCE = 2464 |
