diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-03 22:43:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-03 23:13:06 +0200 |
| commit | a7acab6cda69d55c3d9d75a3ebb6cff68b15e689 (patch) | |
| tree | fb79107f7f9e93451092d1f246243b9022a9ee2e /tests | |
| parent | a763cafc0c69e3fad91f97867b942182804f79b0 (diff) | |
| parent | 9cc74c9f6e8b645e67d45b2070db004caca09af7 (diff) | |
| download | ffmpeg-a7acab6cda69d55c3d9d75a3ebb6cff68b15e689.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vc1dec: Remove separate scaling function for interlaced field MVs
vc1dec: Invoke edge_emulation regardless of MV precision
x86: Use consistent 3dnowext function and macro name suffixes
g723_1: scale output as supposed for the case with postfilter disabled
g723_1: increase excitation storage by 4
g723_1: fix upper bound parameter from inverse maximum autocorrelation
g723_1: make scale_vector() behave like the reference
g723_1: fix off-by-one error in normalize_bits()
g723_1: save/restore excitation with offset to store LPC history
wmapro: prevent division by zero when sample rate is unspecified
x86: proresdsp: improve SIGNEXTEND macro comments
x86: h264dsp: K&R formatting cosmetics
LICENSE: Document all GPL files
Conflicts:
libavcodec/g723_1.c
libavcodec/wmaprodec.c
libavcodec/x86/h264dsp_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ref/fate/acodec-g723_1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/ref/fate/acodec-g723_1 b/tests/ref/fate/acodec-g723_1 index 38b1a1155a..1060042657 100644 --- a/tests/ref/fate/acodec-g723_1 +++ b/tests/ref/fate/acodec-g723_1 @@ -1,4 +1,4 @@ dec0deb2425e908d232d2471acff04a3 *tests/data/fate/acodec-g723_1.g723_1 4800 tests/data/fate/acodec-g723_1.g723_1 -90b20555c962b638dad0e98ac2c05b25 *tests/data/fate/acodec-g723_1.out.wav -stddev: 8418.34 PSNR: 17.82 MAXDIFF:52968 bytes: 95992/ 96000 +87fd529c9e41914f73a865d147cc9516 *tests/data/fate/acodec-g723_1.out.wav +stddev: 8425.98 PSNR: 17.82 MAXDIFF:53268 bytes: 95992/ 96000 |