5455e38e15
The two functions featuring nNull are not particularly needed, so I simply removed them. Conflicts: modules/highgui/src/cap_msmf.hpp