diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-06 02:45:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-06 02:45:12 +0100 |
| commit | 3edff185abfdd089b88ecc5770e5f6a963055a97 (patch) | |
| tree | 62407714d095f71c370e07c78c2c019ab01ff324 /tests | |
| parent | ee4d43ef7a89626de8eaf02bec5a7ca44d96edbf (diff) | |
| parent | f5be84cfbc9c132a867ae8a8c0e0de26ed1a4e88 (diff) | |
| download | ffmpeg-3edff185abfdd089b88ecc5770e5f6a963055a97.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits)
ipmovie: do not read audio packets before the codec is known
truemotion2: check size before GetBitContext initialisation
avio: Only do implicit network initialization for network protocols
avio: Add an URLProtocol flag for indicating that a protocol uses network
adpcm: ADPCM Electronic Arts has always two channels
matroskadec: Fix a bug where a pointer was cached to an array that might later move due to a realloc()
fate: Add missing reference file from 9b4767e4.
mov: Support MOV_CH_LAYOUT_USE_DESCRIPTIONS for labeled descriptions.
4xm: Prevent buffer overreads.
mjpegdec: parse RSTn to prevent skipping other data in mjpeg_decode_scan
vp3: add fate test for non-zero last coefficient
vp3: fix streams with non-zero last coefficient
swscale: remove unused U/V arguments from yuv2rgb_write().
timer: K&R formatting cosmetics
lavf: cosmetics, reformat av_read_frame().
lavf: refactor av_read_frame() to make it easier to understand.
Report an error if pitch_lag is zero in AMR-NB decoder.
Revert "4xm: Prevent buffer overreads."
4xm: Prevent buffer overreads.
4xm: pass the correct remaining buffer size to decode_i2_frame().
...
Conflicts:
libavcodec/4xm.c
libavcodec/mjpegdec.c
libavcodec/truemotion2.c
libavformat/ipmovie.c
libavformat/mov_chan.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/vpx.mak | 3 | ||||
| -rw-r--r-- | tests/ref/fate/vp3-coeff-level64 | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak index 85749f0c80..2d1c8fd619 100644 --- a/tests/fate/vpx.mak +++ b/tests/fate/vpx.mak @@ -7,6 +7,9 @@ fate-ea-vp61: CMD = framecrc -i $(SAMPLES)/ea-vp6/MovieSkirmishGondor.vp6 -t 4 FATE_TESTS += fate-vp3 fate-vp3: CMD = framecrc -i $(SAMPLES)/vp3/vp31.avi +FATE_TESTS += fate-vp3-coeff-level64 +fate-vp3-coeff-level64: CMD = framecrc -i $(SAMPLES)/vp3/coeff_level64.mkv + FATE_TESTS += fate-vp5 fate-vp5: CMD = framecrc -i $(SAMPLES)/vp5/potter512-400-partial.avi -an diff --git a/tests/ref/fate/vp3-coeff-level64 b/tests/ref/fate/vp3-coeff-level64 new file mode 100644 index 0000000000..31a49aa1a9 --- /dev/null +++ b/tests/ref/fate/vp3-coeff-level64 @@ -0,0 +1,8 @@ +0, 0, 4617600, 0x4ba6df50 +0, 6000, 4617600, 0x419fdeaf +0, 12000, 4617600, 0xeb2edced +0, 18000, 4617600, 0xa2bb3a1a +0, 24000, 4617600, 0x411cfb36 +0, 30000, 4617600, 0xb2dc22ed +0, 36000, 4617600, 0x236d23b5 +0, 42000, 4617600, 0x7fef275e |