mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '141fdc763c2841b572d29a2ad78513e8d5325870'
* commit '141fdc763c2841b572d29a2ad78513e8d5325870':
matroska: add the Opus mapping
Conflicts:
libavformat/matroska.c
See: 30549294ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
97edb195f4