diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-15 01:07:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-15 01:16:54 +0100 |
| commit | 4640da7e58509996ff03b1a0b018ca8f337391c7 (patch) | |
| tree | 732195f8bc4987e4974df716789044c7e3db0836 /tests | |
| parent | a91f2066651416e0f9315e7fb0132587352c75dc (diff) | |
| parent | 4cd0bdae9a62d1f0366e60603222762af31e5289 (diff) | |
| download | ffmpeg-4640da7e58509996ff03b1a0b018ca8f337391c7.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
sgidec: Use bytestream2 functions to prevent buffer overreads.
cosmetics: Move static and inline attributes to more standard places.
configure: provide libavfilter/version.h header to get_version()
swscale: change yuv2yuvX code to use cpuflag().
libx264: Don't leave max_b_frames as -1 if the user didn't set it
FATE: convert output to rgba for the targa tests which currently output pal8
fate: add missing reference files for targa tests in 9c2f9b0e2
FATE: enable the 2 remaining targa conformance suite tests
targa: add support for rgb555 palette
FATE: fix targa tests on big-endian systems
Conflicts:
libavcodec/sgidec.c
libavcodec/targa.c
libswscale/x86/output.asm
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/image.mak | 6 | ||||
| -rw-r--r-- | tests/ref/fate/targa-conformance-CCM8 | 1 | ||||
| -rw-r--r-- | tests/ref/fate/targa-conformance-UCM8 | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/tests/fate/image.mak b/tests/fate/image.mak index eb3ff957d4..4c0d361f28 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -34,10 +34,12 @@ FATE_TESTS += $(FATE_IMAGE) fate-image: $(FATE_IMAGE) FATE_TARGA = CBW8 \ + CCM8 \ CTC16 \ CTC24 \ CTC32 \ UBW8 \ + UCM8 \ UTC16 \ UTC24 \ UTC32 @@ -49,12 +51,12 @@ FATE_TESTS += $(FATE_TARGA) fate-targa: $(FATE_TARGA) fate-targa-conformance-CBW8: CMD = framecrc -i $(SAMPLES)/targa-conformance/CBW8.TGA -# fate-targa-conformance-CCM8: CMD = framecrc -i $(SAMPLES)/targa-conformance/CCM8.TGA +fate-targa-conformance-CCM8: CMD = framecrc -i $(SAMPLES)/targa-conformance/CCM8.TGA -pix_fmt rgba fate-targa-conformance-CTC16: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC16.TGA -pix_fmt rgb555le fate-targa-conformance-CTC24: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC24.TGA fate-targa-conformance-CTC32: CMD = framecrc -i $(SAMPLES)/targa-conformance/CTC32.TGA -pix_fmt bgra fate-targa-conformance-UBW8: CMD = framecrc -i $(SAMPLES)/targa-conformance/UBW8.TGA -# fate-targa-conformance-UCM8: CMD = framecrc -i $(SAMPLES)/targa-conformance/UCM8.TGA +fate-targa-conformance-UCM8: CMD = framecrc -i $(SAMPLES)/targa-conformance/UCM8.TGA -pix_fmt rgba fate-targa-conformance-UTC16: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC16.TGA -pix_fmt rgb555le fate-targa-conformance-UTC24: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC24.TGA fate-targa-conformance-UTC32: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC32.TGA -pix_fmt bgra diff --git a/tests/ref/fate/targa-conformance-CCM8 b/tests/ref/fate/targa-conformance-CCM8 new file mode 100644 index 0000000000..92f105e0d3 --- /dev/null +++ b/tests/ref/fate/targa-conformance-CCM8 @@ -0,0 +1 @@ +0, 0, 65536, 0x47e97fe9 diff --git a/tests/ref/fate/targa-conformance-UCM8 b/tests/ref/fate/targa-conformance-UCM8 new file mode 100644 index 0000000000..92f105e0d3 --- /dev/null +++ b/tests/ref/fate/targa-conformance-UCM8 @@ -0,0 +1 @@ +0, 0, 65536, 0x47e97fe9 |