diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 05:19:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 05:19:03 +0200 |
| commit | f1db984288f21a1ecdff0b5702630456c089ce36 (patch) | |
| tree | aa9fc4f16f2d9e0b7dee1d17378a38f364ddb2f4 /tests/fate/lossless-video.mak | |
| parent | 1fa7d0902c3eef6fc17f253b5e90c77167483458 (diff) | |
| parent | fcda30f2dcb744d89df9d5d1ec89ba55279cb83c (diff) | |
| download | ffmpeg-f1db984288f21a1ecdff0b5702630456c089ce36.tar.gz | |
Merge commit 'fcda30f2dcb744d89df9d5d1ec89ba55279cb83c'
* commit 'fcda30f2dcb744d89df9d5d1ec89ba55279cb83c':
fate: Prefix cllc tests with canopus
Conflicts:
tests/fate/lossless-video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/lossless-video.mak')
| -rw-r--r-- | tests/fate/lossless-video.mak | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/fate/lossless-video.mak b/tests/fate/lossless-video.mak index 11eba30acc..514d6fdfea 100644 --- a/tests/fate/lossless-video.mak +++ b/tests/fate/lossless-video.mak @@ -1,14 +1,14 @@ -FATE_CLLC += fate-cllc-argb -fate-cllc-argb: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-argb.avi +FATE_CANOPUS_CLLC += fate-canopus-cllc-argb +fate-canopus-cllc-argb: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-argb.avi -FATE_CLLC += fate-cllc-rgb -fate-cllc-rgb: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-rgb.avi +FATE_CANOPUS_CLLC += fate-canopus-cllc-rgb +fate-canopus-cllc-rgb: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-rgb.avi -FATE_CLLC += fate-cllc-yuy2-noblock -fate-cllc-yuy2-noblock: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-yuy2-noblock.avi +FATE_CANOPUS_CLLC += fate-canopus-cllc-yuy2-noblock +fate-canopus-cllc-yuy2-noblock: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-yuy2-noblock.avi -FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, CLLC) += $(FATE_CLLC) -fate-cllc: $(FATE_CLLC) +FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, CLLC) += $(FATE_CANOPUS_CLLC) +fate-canopus-cllc: $(FATE_CANOPUS_CLLC) FATE_LAGARITH += fate-lagarith-rgb24 fate-lagarith-rgb24: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lag-rgb24.avi |