diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-23 21:04:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-23 21:25:09 +0200 |
| commit | 2cb4d516549526b5e17e941f6d2375a2c501ade6 (patch) | |
| tree | f472c62e0b34c2faaa955d51874cddb6be759910 /tests | |
| parent | 7e15df7551cf45ad1d3e39d20fdc8d6c651d4705 (diff) | |
| parent | d04c5293ce88927ad359ca276e287bfa63c2329d (diff) | |
| download | ffmpeg-2cb4d516549526b5e17e941f6d2375a2c501ade6.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
v410dec: Implement explode mode support
zerocodec: fix direct rendering.
wav: init st to NULL to avoid a false-positive warning.
wavpack: set bits_per_raw_sample for S32 samples to properly identify 24-bit
h264: refactor NAL decode loop
RTMPTE protocol support
RTMPE protocol support
rtmp: Add ff_rtmp_calc_digest_pos()
rtmp: Rename rtmp_calc_digest to ff_rtmp_calc_digest and make it global
swscale: add missing HAVE_INLINE_ASM check.
lavfi: place x86 inline assembly under HAVE_INLINE_ASM.
vc1: Add a test for interlaced field pictures
swscale: Mark all init functions as av_cold
swscale: x86: Drop pointless _mmx suffix from filenames
lavf: use conditional notation for default codec in muxer declarations.
swscale: place inline assembly bilinear scaler under HAVE_INLINE_ASM.
dsputil: ppc: cosmetics: pretty-print
dsputil: x86: add SHUFFLE_MASK_W macro
configure: respect CC_O setting in check_cc
Conflicts:
Changelog
configure
libavcodec/v410dec.c
libavcodec/zerocodec.c
libavformat/asfenc.c
libavformat/version.h
libswscale/utils.c
libswscale/x86/swscale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/microsoft.mak | 3 | ||||
| -rw-r--r-- | tests/ref/fate/vc1_sa10143 | 31 |
2 files changed, 34 insertions, 0 deletions
diff --git a/tests/fate/microsoft.mak b/tests/fate/microsoft.mak index be26abf538..d03a47ec3a 100644 --- a/tests/fate/microsoft.mak +++ b/tests/fate/microsoft.mak @@ -36,6 +36,9 @@ fate-vc1_sa10091: CMD = framecrc -i $(SAMPLES)/vc1/SA10091.vc1 FATE_VC1 += fate-vc1_sa20021 fate-vc1_sa20021: CMD = framecrc -i $(SAMPLES)/vc1/SA20021.vc1 +#FATE_VC1 += fate-vc1_sa10143 +fate-vc1_sa10143: CMD = framecrc -i $(SAMPLES)/vc1/SA10143.vc1 + FATE_VC1 += fate-vc1-ism fate-vc1-ism: CMD = framecrc -i $(SAMPLES)/isom/vc1-wmapro.ism -an diff --git a/tests/ref/fate/vc1_sa10143 b/tests/ref/fate/vc1_sa10143 new file mode 100644 index 0000000000..a008356cf8 --- /dev/null +++ b/tests/ref/fate/vc1_sa10143 @@ -0,0 +1,31 @@ +#tb 0: 1/25 +0, 0, 0, 1, 518400, 0x89407f55 +0, 2, 2, 1, 518400, 0xeb8d84a1 +0, 3, 3, 1, 518400, 0x2121ff57 +0, 4, 4, 1, 518400, 0xd81adb3d +0, 5, 5, 1, 518400, 0x01e36aa2 +0, 6, 6, 1, 518400, 0x6b802361 +0, 7, 7, 1, 518400, 0xc8403c77 +0, 8, 8, 1, 518400, 0xdd342b5d +0, 9, 9, 1, 518400, 0x2100eea5 +0, 10, 10, 1, 518400, 0x92a22da6 +0, 11, 11, 1, 518400, 0x6bacdef7 +0, 12, 12, 1, 518400, 0x4a00715f +0, 13, 13, 1, 518400, 0x59b98727 +0, 14, 14, 1, 518400, 0xbf912ee1 +0, 15, 15, 1, 518400, 0x8c966cd6 +0, 16, 16, 1, 518400, 0x2c9a2535 +0, 17, 17, 1, 518400, 0x29085c06 +0, 18, 18, 1, 518400, 0x46ae6b7d +0, 19, 19, 1, 518400, 0x283100f4 +0, 20, 20, 1, 518400, 0x2731b5ff +0, 21, 21, 1, 518400, 0x1132ea54 +0, 22, 22, 1, 518400, 0x37cbe539 +0, 23, 23, 1, 518400, 0x08ff75cf +0, 24, 24, 1, 518400, 0xafb6bc45 +0, 25, 25, 1, 518400, 0x19d3873d +0, 26, 26, 1, 518400, 0xd494a8be +0, 27, 27, 1, 518400, 0x285f41ef +0, 28, 28, 1, 518400, 0xd4b1ffa1 +0, 29, 29, 1, 518400, 0xc3876c3a +0, 30, 30, 1, 518400, 0xb73dbb62 |