* commit '79041d92':
  matroska: add the Opus mapping

Conflicts:
	libavformat/matroska.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>