diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-01 01:13:16 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-01 03:17:11 +0100 |
commit | 79ae084e9b930f8b53ae0499c6a06636d194574d (patch) | |
tree | e7d829e566b01ef7e84a12b06a2bcb87a8164059 /tests/ref/fate | |
parent | a77c8ade2ee20fc6149e4c689a3f196f53e85273 (diff) | |
parent | 882abda5a26ffb8e3d1c5852dfa7cdad0a291d2d (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (58 commits)
amrnbdec: check frame size before decoding.
cscd: use negative error values to indicate decode_init() failures.
h264: prevent overreads in intra PCM decoding.
FATE: do not decode audio in the nuv test.
dxa: set audio stream time base using the sample rate
psx-str: do not allow seeking by bytes
asfdec: Do not set AVCodecContext.frame_size
vqf: set packet parameters after av_new_packet()
mpegaudiodec: use DSPUtil.butterflies_float().
FATE: add mp3 test for sample that exhibited false overreads
fate: add cdxl test for bit line plane arrangement
vmnc: return error on decode_init() failure.
libvorbis: add/update error messages
libvorbis: use AVFifoBuffer for output packet buffer
libvorbis: remove unneeded e_o_s check
libvorbis: check return values for functions that can return errors
libvorbis: use float input instead of s16
libvorbis: do not flush libvorbis analysis if dsp state was not initialized
libvorbis: use VBR by default, with default quality of 3
libvorbis: fix use of minrate/maxrate AVOptions
...
Conflicts:
Changelog
doc/APIchanges
libavcodec/avcodec.h
libavcodec/dpxenc.c
libavcodec/libvorbis.c
libavcodec/vmnc.c
libavformat/asfdec.c
libavformat/id3v2enc.c
libavformat/internal.h
libavformat/mp3enc.c
libavformat/utils.c
libavformat/version.h
libswscale/utils.c
tests/fate/video.mak
tests/ref/fate/nuv
tests/ref/fate/prores-alpha
tests/ref/lavf/ffm
tests/ref/vsynth1/prores
tests/ref/vsynth2/prores
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate')
-rw-r--r-- | tests/ref/fate/cdxl-bitline-ham6 | 11 | ||||
-rw-r--r-- | tests/ref/fate/nuv | 19 |
2 files changed, 11 insertions, 19 deletions
diff --git a/tests/ref/fate/cdxl-bitline-ham6 b/tests/ref/fate/cdxl-bitline-ham6 new file mode 100644 index 0000000000..8060f06024 --- /dev/null +++ b/tests/ref/fate/cdxl-bitline-ham6 @@ -0,0 +1,11 @@ +#tb 0: 12/601 +0, 0, 0, 1, 63180, 0xcda82c16 +0, 1, 1, 1, 63180, 0xa6097bf9 +0, 2, 2, 1, 63180, 0x4c2fb091 +0, 3, 3, 1, 63180, 0xc597db00 +0, 4, 4, 1, 63180, 0xfa581ccd +0, 5, 5, 1, 63180, 0x3e51498f +0, 6, 6, 1, 63180, 0xe3495396 +0, 7, 7, 1, 63180, 0x425f5f02 +0, 8, 8, 1, 63180, 0x6077465f +0, 9, 9, 1, 63180, 0x923ba29c diff --git a/tests/ref/fate/nuv b/tests/ref/fate/nuv index 0cc9001793..8838fbb646 100644 --- a/tests/ref/fate/nuv +++ b/tests/ref/fate/nuv @@ -1,29 +1,10 @@ #tb 0: 100/2997 -#tb 1: 1/44100 -1, 0, 0, 1024, 4096, 0x00000000 -1, 1024, 1024, 1024, 4096, 0x4dfae7a6 -1, 2048, 2048, 1024, 4096, 0x3fd9f5c6 -1, 3072, 3072, 1024, 4096, 0x7b86e310 -1, 4096, 4096, 1024, 4096, 0x611cece5 -1, 5120, 5120, 1024, 4096, 0xb7d8e872 0, 4, 4, 1, 460800, 0x54aedafe -1, 6144, 6144, 1024, 4096, 0x072ef72b -1, 7168, 7168, 1024, 4096, 0xb3560144 0, 5, 5, 1, 460800, 0xb7aa8b56 -1, 8192, 8192, 1024, 4096, 0x0a3d119e 0, 6, 6, 1, 460800, 0x283ea3b5 -1, 9216, 9216, 1024, 4096, 0xbe391aa4 -1, 10240, 10240, 1024, 4096, 0x28f7c6e5 0, 7, 7, 1, 460800, 0x283ea3b5 -1, 11264, 11264, 1024, 4096, 0xca9d9df2 0, 8, 8, 1, 460800, 0x10e577de -1, 12288, 12288, 1024, 4096, 0x5c6b95a9 0, 9, 9, 1, 460800, 0x4e091ee2 -1, 13312, 13312, 1024, 4096, 0x0bdfc0bf -1, 14336, 14336, 1024, 4096, 0xd95a9277 0, 10, 10, 1, 460800, 0x2ea88828 -1, 15360, 15360, 1024, 4096, 0xae2bef2c 0, 11, 11, 1, 460800, 0x4b7f4df0 -1, 16384, 16384, 1024, 4096, 0xbf031e83 -1, 17408, 17408, 1024, 4096, 0x4c83e2d1 0, 12, 12, 1, 460800, 0xa57f20d0 |