Merge changes I05aeb909,Iee31eed6,I2544a7cb into qt-dev

* changes:
  C2SoftOpusEnc: Populate skip_samples in OpusHeader
  MPEG4Extractor: Overwrite opus version as 1
  CCodecConfig: Fix mapping to bitrate-mode