diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-23 12:24:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-23 12:26:08 +0100 |
| commit | 8b63eeb6b1c2f9e7d762f32dbd42dae124591314 (patch) | |
| tree | 22c4f47fceef730a0f193cd168514ea65baeee66 /tests/fate/screen.mak | |
| parent | 9bb6504e3bff2e00610f52cc41938aa8c2a3ad4c (diff) | |
| parent | 3f15b301fa61547f59f1452b14edf14e5673fdd2 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: add test for cropping h264 to container dimensions
FATE: add a tscc2 test.
tscc2: allocate AVFrame properly.
Conflicts:
libavcodec/tscc2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/screen.mak')
| -rw-r--r-- | tests/fate/screen.mak | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/fate/screen.mak b/tests/fate/screen.mak index b55e02b42b..e1b854ef55 100644 --- a/tests/fate/screen.mak +++ b/tests/fate/screen.mak @@ -35,6 +35,9 @@ fate-tscc-32bit: CMD = framecrc -i $(SAMPLES)/tscc/2004-12-17-uebung9-partial.av FATE_SCREEN-$(call DEMDEC, AVI, TSCC) += $(FATE_TSCC) fate-tscc: $(FATE_TSCC) +FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, TSCC2) += fate-tscc2 +fate-tscc2: CMD = framecrc -i $(SAMPLES)/tscc/tsc2_16bpp.avi + FATE_VMNC += fate-vmnc-16bit fate-vmnc-16bit: CMD = framecrc -i $(SAMPLES)/VMnc/test.avi -pix_fmt rgb24 |