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/fate | |
| parent | a77c8ade2ee20fc6149e4c689a3f196f53e85273 (diff) | |
| parent | 882abda5a26ffb8e3d1c5852dfa7cdad0a291d2d (diff) | |
| download | ffmpeg-79ae084e9b930f8b53ae0499c6a06636d194574d.tar.gz | |
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/fate')
| -rw-r--r-- | tests/fate/cdxl.mak | 3 | ||||
| -rw-r--r-- | tests/fate/mp3.mak | 5 | ||||
| -rw-r--r-- | tests/fate/video.mak | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/tests/fate/cdxl.mak b/tests/fate/cdxl.mak index 82ac27e430..3a46c5ce50 100644 --- a/tests/fate/cdxl.mak +++ b/tests/fate/cdxl.mak @@ -10,5 +10,8 @@ fate-cdxl-pal8: CMD = framecrc -i $(SAMPLES)/cdxl/maku.cdxl -pix_fmt rgb24 -fram FATE_CDXL += fate-cdxl-pal8-small fate-cdxl-pal8-small: CMD = framecrc -i $(SAMPLES)/cdxl/fruit.cdxl -an -pix_fmt rgb24 -frames:v 46 +FATE_CDXL += fate-cdxl-bitline-ham6 +fate-cdxl-bitline-ham6: CMD = framecrc -i $(SAMPLES)/cdxl/bitline.cdxl -frames:v 10 + FATE_TESTS += $(FATE_CDXL) fate-cdxl: $(FATE_CDXL) diff --git a/tests/fate/mp3.mak b/tests/fate/mp3.mak index 9dfa829008..4c16cb84e0 100644 --- a/tests/fate/mp3.mak +++ b/tests/fate/mp3.mak @@ -33,6 +33,11 @@ fate-mp3-float-conf-si_block: CMD = pcm -acodec mp3float -i $(SAMPLES)/mp3-confo fate-mp3-float-conf-si_block: CMP = stddev fate-mp3-float-conf-si_block: REF = $(SAMPLES)/mp3-conformance/si_block.pcm +FATE_MP3 += fate-mp3-float-extra_overread +fate-mp3-float-extra_overread: CMD = pcm -c:a mp3float -i $(SAMPLES)/mpegaudio/extra_overread.mp3 +fate-mp3-float-extra_overread: CMP = stddev +fate-mp3-float-extra_overread: REF = $(SAMPLES)/mpegaudio/extra_overread.pcm + FATE_TESTS += $(FATE_MP3) fate-mp3: $(FATE_MP3) $(FATE_MP3): CMP = stddev diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 84a98f6fcc..02aa39598c 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -143,7 +143,7 @@ FATE_VIDEO += fate-mpeg2-field-enc fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an FATE_VIDEO += fate-nuv -fate-nuv: CMD = framecrc -idct simple -i $(SAMPLES)/nuv/Today.nuv +fate-nuv: CMD = framecrc -idct simple -i $(SAMPLES)/nuv/Today.nuv -an FATE_VIDEO += fate-qpeg fate-qpeg: CMD = framecrc -i $(SAMPLES)/qpeg/Clock.avi -an -pix_fmt rgb24 |