[FFmpeg-cvslog] Merge commit 'b6507930ac1898aed62ab0b56afc7d6734ad830b'
Michael Niedermayer
git at videolan.org
Tue Jun 25 17:53:43 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 25 11:26:59 2013 +0200| [7efcd531cf221a6257d26df51024c9aa299bb118] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7efcd531cf221a6257d26df51024c9aa299bb118
---
More information about the ffmpeg-cvslog
mailing list