More support for audio and video extra data