diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-18 02:23:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-18 03:04:44 +0100 |
| commit | 1bdc212a39312bd5914d643a4e664b4599477d8c (patch) | |
| tree | 19fcd489c7ec86908e240f1d6f6752d587dc97e7 /tests | |
| parent | 1a2484fc4e5c5effc32c55c2f25670ec23cbf57b (diff) | |
| parent | 0ea5b44275aa334528eb384a6548cc9f98c50a17 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: link test programs with static libraries
dct-test: remove unused variable cropTbl
swscale: fix overflow in gray16 vertical scaling.
get_bits: remove LAST_SKIP_CACHE macro
swscale: fix integer overflows in RGB pixel writing.
swscale: add endian conversion for RGB555 and RGB444 pixel formats
swscale: fix overflows in output of RGB48 pixels.
get_bits: remove strange/obsolete comments
get_bits: whitespace (mostly) cosmetics
swscale: add rgb565 endianess conversion
get_bits: remove unnecessary #includes
mp3dec: hack: fix decoding with safe bitstream reader
fate: fix eatqi test
adpcm: Check for channels to be a non-zero integer
swscale: fix overflows in RGB rounding constants.
get_bits: introduce safe bitreading to prevent overreads.
Conflicts:
libswscale/swscale.c
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate.mak | 2 | ||||
| -rw-r--r-- | tests/ref/fate/ea-tqi-adpcm | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tests/fate.mak b/tests/fate.mak index 067aaad1dc..dc047940b1 100644 --- a/tests/fate.mak +++ b/tests/fate.mak @@ -89,7 +89,7 @@ fate-ea-tgv-ima-ea-eacs: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTRO8K-partial.TG FATE_TESTS += fate-ea-tgv-ima-ea-sead fate-ea-tgv-ima-ea-sead: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTEL_S.TGV -pix_fmt rgb24 FATE_TESTS += fate-ea-tqi-adpcm -fate-ea-tqi-adpcm: CMD = framecrc -i $(SAMPLES)/ea-wve/networkBackbone-partial.wve +fate-ea-tqi-adpcm: CMD = framecrc -i $(SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:v 26 FATE_TESTS += fate-ea-vp60 fate-ea-vp60: CMD = framecrc -i $(SAMPLES)/ea-vp6/g36.vp6 FATE_TESTS += fate-ea-vp61 diff --git a/tests/ref/fate/ea-tqi-adpcm b/tests/ref/fate/ea-tqi-adpcm index c79eed52bd..4fbc117070 100644 --- a/tests/ref/fate/ea-tqi-adpcm +++ b/tests/ref/fate/ea-tqi-adpcm @@ -49,4 +49,3 @@ 0, 144000, 115200, 0x65fd5e60 1, 144000, 5936, 0x2174304d 0, 150000, 115200, 0x0c256424 -0, 156000, 115200, 0xa9cdd8d2 |