diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-25 11:26:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-25 11:27:16 +0200 |
| commit | 7efcd531cf221a6257d26df51024c9aa299bb118 (patch) | |
| tree | b55a36cf82cb3bf9f1002dd7e70be1557be55068 /libavfilter/vf_alphamerge.c | |
| parent | 11081ab6be3777b7d608f8bd305e12010ba1da03 (diff) | |
| parent | b6507930ac1898aed62ab0b56afc7d6734ad830b (diff) | |
| download | ffmpeg-7efcd531cf221a6257d26df51024c9aa299bb118.tar.gz | |
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>
Diffstat (limited to 'libavfilter/vf_alphamerge.c')
0 files changed, 0 insertions, 0 deletions