diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-14 21:56:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-14 22:24:00 +0200 |
| commit | bd4ebbbbed47761df65dd574dce6d3c56d29e2e7 (patch) | |
| tree | 415ffb3c9ed9507a7c6ae115e1c201a85271e4ed /tests/ref/acodec/g726 | |
| parent | 4b9e9a57eeadf1ece872b19a433b3c004aaa5e46 (diff) | |
| parent | 05c8f119cc6b5727319c56b055af82ac1ded93b5 (diff) | |
| download | ffmpeg-bd4ebbbbed47761df65dd574dce6d3c56d29e2e7.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
proresdsp: fix function prototypes.
prores-idct: fix overflow in c code.
fate: update prores-alpha ref after changing pix_fmt to yuv444p10le
prores: add missing feature warning for alpha
mov: 10l: Terminate string with 0 not '0'
mov: Prevent illegal writes when chapter titles are very short.
prores: add appropriate -fix_fmt parameter to FATE command
riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header
lavc: add a flag-based error_recognition field to AVCodecContext and deprecate non-flag-based ER field
lavc: rename deprecation symbol FF_API_VERY_AGGRESSIVE to FF_API_ER
Conflicts:
libavcodec/avcodec.h
libavformat/mov.c
tests/fate/prores.mak
tests/ref/acodec/g726
tests/ref/fate/prores-alpha
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/acodec/g726')
| -rw-r--r-- | tests/ref/acodec/g726 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/ref/acodec/g726 b/tests/ref/acodec/g726 index f8d6f4d02e..c519ac297e 100644 --- a/tests/ref/acodec/g726 +++ b/tests/ref/acodec/g726 @@ -1,4 +1,4 @@ -687d70267e999fc9afba2a1ecc960f3c *./tests/data/acodec/g726.wav -24052 ./tests/data/acodec/g726.wav -700845e9457cae5f961fb703cb46d6a7 *./tests/data/g726.acodec.out.wav +331fcf91f4483b508059d0933af97987 *./tests/data/acodec/g726.wav +24054 ./tests/data/acodec/g726.wav +fac563ba7947d8fc42b4af048707c145 *./tests/data/g726.acodec.out.wav stddev: 8553.69 PSNR: 17.69 MAXDIFF:29353 bytes: 95984/ 1058400 |