]> git.sesse.net Git - casparcg/commitdiff
Merge pull request #224 from ronag/master
authorHellGore <helge.norberg@gmail.com>
Wed, 15 Jan 2014 09:14:19 +0000 (01:14 -0800)
committerHellGore <helge.norberg@gmail.com>
Wed, 15 Jan 2014 09:14:19 +0000 (01:14 -0800)
Updated master to latest ffmpeg version.


Trivial merge