Commit 7efcd531 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'b6507930'

* commit 'b6507930':
  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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 11081ab6 b6507930
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment