Adapt removed changes from old commit for G192 bitstream decoder format switching.