Merge changes I88f247a2,I7e1daf93 into qt-dev

* changes:
  MPEG4Extractor: Fix opus CSD size
  OpusHeader: Fix OOB write in WriteOpusHeaders()