SUP-2317

fixed bitrate flavour selection from all sources