]> git.sesse.net Git - ffmpeg/commit
Merge commit 'fcda30f2dcb744d89df9d5d1ec89ba55279cb83c'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 03:19:03 +0000 (05:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 03:19:03 +0000 (05:19 +0200)
commitf1db984288f21a1ecdff0b5702630456c089ce36
treeaa9fc4f16f2d9e0b7dee1d17378a38f364ddb2f4
parent1fa7d0902c3eef6fc17f253b5e90c77167483458
parentfcda30f2dcb744d89df9d5d1ec89ba55279cb83c
Merge commit 'fcda30f2dcb744d89df9d5d1ec89ba55279cb83c'

* commit 'fcda30f2dcb744d89df9d5d1ec89ba55279cb83c':
  fate: Prefix cllc tests with canopus

Conflicts:
tests/fate/lossless-video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tests/fate/lossless-video.mak