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 /libavcodec/canopus.h | |
| 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 'libavcodec/canopus.h')
0 files changed, 0 insertions, 0 deletions