Merge "test/reg...check,video_source.h: avoid NOMINMAX redef"