dvbsuboverlay: clean-up: merge private data struct into main struct