Minor optimisations, consumer avformat experimentation