genlock: backport from CAF @dc6023b