diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-16 01:23:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-16 01:23:15 +0100 |
| commit | 175cc378b3bd970caf1641e5df3361d6233747e1 (patch) | |
| tree | d237cb08b1b6909154a007d3c06f0dab61b9700f /tests/ref | |
| parent | 56669837ce18d15d757a144712a082b9cb535c94 (diff) | |
| parent | d3b8bde2f14f78109a892e57f544bf840cf6d4fc (diff) | |
| download | ffmpeg-175cc378b3bd970caf1641e5df3361d6233747e1.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: Rudimentary IODs support.
v410enc: fix output buffer size check
v410enc: include correct headers
fate: add -pix_fmt rgb48le to r210 test
flvenc: Support muxing 16 kHz nellymoser
configure: refactor list of programs into a variable
fate: add r210 decoder test
fate: split off Indeo FATE tests into their own file
fate: split off ATRAC FATE tests into their own file
fate: Add FATE tests for v410 encoder and decoder
ARM: fix external symbol refs in rv40 asm
westwood: Make sure audio header info is present when parsing audio packets
libgsm: Reset the MS mode of GSM in the flush function
libgsm: Set options on the right object
ARM: dca: disable optimised decode_blockcodes() for old gcc
Conflicts:
configure
libavformat/movenc.c
libavformat/movenc.h
tests/fate2.mak
tests/ref/acodec/alac
tests/ref/vsynth1/mpeg4
tests/ref/vsynth2/mpeg4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref')
| -rw-r--r-- | tests/ref/acodec/alac | 4 | ||||
| -rw-r--r-- | tests/ref/fate/r210 | 3 | ||||
| -rw-r--r-- | tests/ref/vsynth1/mpeg4 | 4 | ||||
| -rw-r--r-- | tests/ref/vsynth2/mpeg4 | 4 |
4 files changed, 9 insertions, 6 deletions
diff --git a/tests/ref/acodec/alac b/tests/ref/acodec/alac index db6393ac46..39264c53c7 100644 --- a/tests/ref/acodec/alac +++ b/tests/ref/acodec/alac @@ -1,4 +1,4 @@ -4fe333ff79e86cca6ba8c109cc08263e *./tests/data/acodec/alac.m4a -389166 ./tests/data/acodec/alac.m4a +bff6044a7f303d8482775f4fcdc2d272 *./tests/data/acodec/alac.m4a +389190 ./tests/data/acodec/alac.m4a 64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/alac.acodec.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 diff --git a/tests/ref/fate/r210 b/tests/ref/fate/r210 new file mode 100644 index 0000000000..238a1364e5 --- /dev/null +++ b/tests/ref/fate/r210 @@ -0,0 +1,3 @@ +0, 0, 1843200, 0xbd414b93 +0, 3003, 1843200, 0x23298f1f +0, 6006, 1843200, 0x5a56df19 diff --git a/tests/ref/vsynth1/mpeg4 b/tests/ref/vsynth1/mpeg4 index fbf3b8fdcc..3d6f985e5a 100644 --- a/tests/ref/vsynth1/mpeg4 +++ b/tests/ref/vsynth1/mpeg4 @@ -1,4 +1,4 @@ -f32960be0f05be8b2ed03447e1eaea6f *./tests/data/vsynth1/odivx.mp4 -539996 ./tests/data/vsynth1/odivx.mp4 +146bf838d7efd524595c68145337dfef *./tests/data/vsynth1/odivx.mp4 +540020 ./tests/data/vsynth1/odivx.mp4 8828a375448dc5c2215163ba70656f89 *./tests/data/mpeg4.vsynth1.out.yuv stddev: 7.97 PSNR: 30.10 MAXDIFF: 105 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth2/mpeg4 b/tests/ref/vsynth2/mpeg4 index 726e1d9436..35729a0a7a 100644 --- a/tests/ref/vsynth2/mpeg4 +++ b/tests/ref/vsynth2/mpeg4 @@ -1,4 +1,4 @@ -4d092ca067362a61b9c96f5f12a1ab5a *./tests/data/vsynth2/odivx.mp4 -119649 ./tests/data/vsynth2/odivx.mp4 +ad44d4d5a20fbd40641703a5de46fd5c *./tests/data/vsynth2/odivx.mp4 +119673 ./tests/data/vsynth2/odivx.mp4 90a3577850239083a9042bef33c50e85 *./tests/data/mpeg4.vsynth2.out.yuv stddev: 5.34 PSNR: 33.57 MAXDIFF: 83 bytes: 7603200/ 7603200 |