Merge changes I16e1fa82,Ic59ebc1b

* changes:
  Convert MatroskaExtractor to V3 format
  Convert MPEG4Extractor to V3 format