[FFmpeg-cvslog] Merge commit 'fcda30f2dcb744d89df9d5d1ec89ba55279cb83c'
Michael Niedermayer
git at videolan.org
Mon Apr 20 05:27:40 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 20 05:19:03 2015 +0200| [f1db984288f21a1ecdff0b5702630456c089ce36] | committer: Michael Niedermayer
Merge commit 'fcda30f2dcb744d89df9d5d1ec89ba55279cb83c'
* commit 'fcda30f2dcb744d89df9d5d1ec89ba55279cb83c':
fate: Prefix cllc tests with canopus
Conflicts:
tests/fate/lossless-video.mak
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f1db984288f21a1ecdff0b5702630456c089ce36
---
More information about the ffmpeg-cvslog
mailing list