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/ref | |
parent | 1fa7d0902c3eef6fc17f253b5e90c77167483458 (diff) | |
parent | fcda30f2dcb744d89df9d5d1ec89ba55279cb83c (diff) |
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/ref')
-rw-r--r-- | tests/ref/fate/canopus-cllc-argb (renamed from tests/ref/fate/cllc-argb) | 0 | ||||
-rw-r--r-- | tests/ref/fate/canopus-cllc-rgb (renamed from tests/ref/fate/cllc-rgb) | 0 | ||||
-rw-r--r-- | tests/ref/fate/canopus-cllc-yuy2-noblock (renamed from tests/ref/fate/cllc-yuy2-noblock) | 0 |
3 files changed, 0 insertions, 0 deletions
diff --git a/tests/ref/fate/cllc-argb b/tests/ref/fate/canopus-cllc-argb index 4a5dce56db..4a5dce56db 100644 --- a/tests/ref/fate/cllc-argb +++ b/tests/ref/fate/canopus-cllc-argb diff --git a/tests/ref/fate/cllc-rgb b/tests/ref/fate/canopus-cllc-rgb index b4ca0553db..b4ca0553db 100644 --- a/tests/ref/fate/cllc-rgb +++ b/tests/ref/fate/canopus-cllc-rgb diff --git a/tests/ref/fate/cllc-yuy2-noblock b/tests/ref/fate/canopus-cllc-yuy2-noblock index 6ad59d504a..6ad59d504a 100644 --- a/tests/ref/fate/cllc-yuy2-noblock +++ b/tests/ref/fate/canopus-cllc-yuy2-noblock |