Part of this patch is based on Paul B Mahol's patch from last year.

This also allows for single-stream parameter/codec changes.