]> git.sesse.net Git - casparcg/commit
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)
commitfcd3a8a5dca16cc49250c2f0d512deb9fd78dd7f
tree372004bf5dc9a7a45f13a786d14bfe3f397c13ff
parent705cc3c6529b5fd82918d65b693e02919406cd94
parent6bb3703246915e3482ea0d7022c4c7ca67228510
Merge branch 'master' into ffmpeg_seek_fix

Conflicts:
modules/ffmpeg/producer/util/util.cpp
modules/ffmpeg/producer/util/util.cpp