add support for audio/video encryption with separate keys
tidied up manifest generation