Michael Niedermayer 97edb195f4 Merge commit '141fdc763c2841b572d29a2ad78513e8d5325870' ...

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

Conflicts:
	libavformat/matroska.c

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

2014-05-01 16:03:30 +02:00

5.6 KiB

Raw Blame History

View Raw