diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-03 00:09:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-03 00:23:10 +0100 |
| commit | 268098d8b2a6e3dd84be788a2cd6fda10f7b3e71 (patch) | |
| tree | afd9e17a980920b66edb38331e5a608308da711d /tests/ref/acodec/g722 | |
| parent | 689f65126be8a55e8a1e706cb56b19bb975c20ce (diff) | |
| parent | 9d87374ec0f382c8394ad511243db6980afa42af (diff) | |
| download | ffmpeg-268098d8b2a6e3dd84be788a2cd6fda10f7b3e71.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (29 commits)
amrwb: remove duplicate arguments from extrapolate_isf().
amrwb: error out early if mode is invalid.
h264: change underread for 10bit QPEL to overread.
matroska: check buffer size for RM-style byte reordering.
vp8: disable mmx functions with sse/sse2 counterparts on x86-64.
vp8: change int stride to ptrdiff_t stride.
wma: fix invalid buffer size assumptions causing random overreads.
Windows Media Audio Lossless decoder
rv10/20: Fix slice overflow with checked bitstream reader.
h263dec: Disallow width/height changing with frame threads.
rv10/20: Fix a buffer overread caused by losing track of the remaining buffer size.
rmdec: Honor .RMF tag size rather than assuming 18.
g722: Fix the QMF scaling
r3d: don't set codec timebase.
electronicarts: set timebase for tgv video.
electronicarts: parse the framerate for cmv video.
ogg: don't set codec timebase
electronicarts: don't set codec timebase
avs: don't set codec timebase
wavpack: Fix an integer overflow
...
Conflicts:
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/fraps.c
libavcodec/h264.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/msmpeg4.c
libavcodec/pnmdec.c
libavcodec/qpeg.c
libavcodec/rawenc.c
libavcodec/ulti.c
libavcodec/vcr1.c
libavcodec/version.h
libavcodec/wmalosslessdec.c
libavformat/electronicarts.c
libswscale/ppc/yuv2rgb_altivec.c
tests/ref/acodec/g722
tests/ref/fate/ea-cmv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/acodec/g722')
| -rw-r--r-- | tests/ref/acodec/g722 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/ref/acodec/g722 b/tests/ref/acodec/g722 index 67e4442a86..1e766d8455 100644 --- a/tests/ref/acodec/g722 +++ b/tests/ref/acodec/g722 @@ -1,4 +1,4 @@ -b813a52d4efe6cf7974190ea9c4c7e8c *./tests/data/acodec/g722.wav +d1a10c4d35f752f60798114a156be3a8 *./tests/data/acodec/g722.wav 48053 ./tests/data/acodec/g722.wav -d8344d14a11eef0418b856af70694cbe *./tests/data/g722.acodec.out.wav -stddev: 8841.18 PSNR: 17.40 MAXDIFF:36225 bytes: 191980/ 1058400 +8dafe5b74ccd5f08fed2fb2a69c5475f *./tests/data/g722.acodec.out.wav +stddev: 8939.47 PSNR: 17.30 MAXDIFF:40370 bytes: 191980/ 1058400 |