]> git.sesse.net Git - casparcg/commit
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
authorHelge Norberg <helge.norberg@svt.se>
Mon, 3 Oct 2016 14:44:09 +0000 (16:44 +0200)
committerHelge Norberg <helge.norberg@svt.se>
Mon, 3 Oct 2016 14:44:09 +0000 (16:44 +0200)
commitc0dc760a3d87b346c9f267cd9d74c67c55d3bdc3
tree7d9d87312734c502b66023980f3b5a6a6acb544c
parenta111f54e43d6b3974036b6e7812b39558409910f
parent61974506572c47b0650c4b5bfa65cd18621d5fec
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
modules/ffmpeg/producer/audio/audio_decoder.cpp
modules/ffmpeg/producer/ffmpeg_producer.cpp
modules/ffmpeg/producer/input/input.cpp
modules/ffmpeg/producer/video/video_decoder.cpp