V4L/DVB (3341): Upstream sync - make 2 structs static