]> git.sesse.net Git - casparcg/commit
Manually merged 77fbc02 from master
authorniklaspandersson <niklas.p.andersson@svt.se>
Fri, 30 Aug 2013 09:54:14 +0000 (11:54 +0200)
committerniklaspandersson <niklas.p.andersson@svt.se>
Fri, 30 Aug 2013 09:54:14 +0000 (11:54 +0200)
commitcac1e82b597a3df724fb9ca596cf5e7afb548c34
tree2ba7b30b424e1f71620e55bd930dcfb4b8408be8
parentffa8894cee9bbb2164f7055985c16f469dfec783
Manually merged 77fbc02 from master
Manually merged 597805e from master
Manually merged 78c8a30 from master
Manually merged 306459b from master
Manually merged 55a287b from master
Manually merged 50fa7a3 from master
Manually merged 0f3ee44 from master
Manually merged 1cdee8b from master

(all have to do with 4k support)
core/video_format.cpp
core/video_format.h
modules/decklink/decklink.vcxproj
modules/decklink/decklink.vcxproj.filters
modules/decklink/interop/DeckLinkAPIVersion.h
modules/decklink/util/util.h
shell/casparcg.config