]> git.sesse.net Git - casparcg/commitdiff
Merge branch 'master' into ffmpeg_seek_fix
authorHelge Norberg <helge.norberg@gmail.com>
Thu, 14 Nov 2013 16:07:18 +0000 (17:07 +0100)
committerHelge Norberg <helge.norberg@gmail.com>
Thu, 14 Nov 2013 16:07:18 +0000 (17:07 +0100)
Conflicts:
modules/ffmpeg/producer/util/util.cpp

1  2 
modules/ffmpeg/producer/util/util.cpp

Simple merge