mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
Merge commit 'b6507930ac1898aed62ab0b56afc7d6734ad830b'
* 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>
This commit is contained in:
commit
7efcd531cf