* commit '141fdc76':
  matroska: add the Opus mapping

Conflicts:
	libavformat/matroska.c

See: 30549294
Merged-by: Michael Niedermayer <michaelni@gmx.at>