diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-26 02:10:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-26 02:34:24 +0200 |
| commit | c684cb29bc6e81b9b2973e826b6fec98f8bafe8c (patch) | |
| tree | 9d639d03103bb07cb955becdd3713f8b300f6b8f /tests | |
| parent | 0c3a3b75d743602dfa207936862789e93327cfc7 (diff) | |
| parent | db70730291df74595873d41914d2ef398fb13364 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: fft: remove unused fft_dispatch* functions
avconv: remove unused variable opt_shortest
FATE: Add Canopus Lossless tests
cllc: Pad swapped buffer
Conflicts:
ffmpeg_opt.c
tests/ref/fate/cllc-argb
tests/ref/fate/cllc-rgb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/lossless-video.mak | 18 | ||||
| -rw-r--r-- | tests/ref/fate/cllc-argb | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tests/fate/lossless-video.mak b/tests/fate/lossless-video.mak index 9553817117..2ae035b998 100644 --- a/tests/fate/lossless-video.mak +++ b/tests/fate/lossless-video.mak @@ -1,3 +1,12 @@ +FATE_CLLC += fate-cllc-rgb +fate-cllc-rgb: CMD = framecrc -i $(SAMPLES)/cllc/sample-cllc-rgb.avi + +FATE_CLLC += fate-cllc-argb +fate-cllc-argb: CMD = framecrc -i $(SAMPLES)/cllc/sample-cllc-argb.avi + +FATE_LOSSLESS_VIDEO += $(FATE_CLLC) +fate-cllc: $(FATE_CLLC) + FATE_LAGARITH += fate-lagarith-rgb24 fate-lagarith-rgb24: CMD = framecrc -i $(SAMPLES)/lagarith/lag-rgb24.avi @@ -37,14 +46,5 @@ fate-zlib: CMD = framecrc -i $(SAMPLES)/lcl/zlib-1frame.avi FATE_LOSSLESS_VIDEO += fate-zerocodec fate-zerocodec: CMD = framecrc -i $(SAMPLES)/zerocodec/sample-zeco.avi -FATE_CLLC += fate-cllc-rgb -fate-cllc-rgb: CMD = framecrc -i $(SAMPLES)/cllc/sample-cllc-rgb.avi - -FATE_CLLC += fate-cllc-argb -fate-cllc-argb: CMD = framecrc -i $(SAMPLES)/cllc/sample-cllc-argb.avi - -FATE_LOSSLESS_VIDEO += $(FATE_CLLC) -fate-cllc: $(FATE_CLLC) - FATE_SAMPLES_FFMPEG += $(FATE_LOSSLESS_VIDEO) fate-lossless-video: $(FATE_LOSSLESS_VIDEO) diff --git a/tests/ref/fate/cllc-argb b/tests/ref/fate/cllc-argb index 7d09fba537..4a5dce56db 100644 --- a/tests/ref/fate/cllc-argb +++ b/tests/ref/fate/cllc-argb @@ -3,4 +3,4 @@ 0, 1, 1, 1, 3686400, 0x66a45032 0, 2, 2, 1, 3686400, 0xdf0c861f 0, 3, 3, 1, 3686400, 0xa4a68cdb -0, 4, 4, 1, 3686400, 0xc9b14908 +0, 4, 4, 1, 3686400, 0xb5f9526e |