Merge commit 'b6507930ac1898aed62ab0b56afc7d6734ad830b'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Jun 2013 09:26:59 +0000 (11:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Jun 2013 09:27:16 +0000 (11:27 +0200)
* commit 'b6507930ac1898aed62ab0b56afc7d6734ad830b':
  fate: Add Canopus Lossless YUY2 test

Conflicts:
tests/fate/lossless-video.mak
tests/ref/fate/cllc-yuy2-noblock

No change as the change is already in master

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge