Merge commit '141fdc763c2841b572d29a2ad78513e8d5325870'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 13:59:01 +0000 (15:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 14:03:30 +0000 (16:03 +0200)
commit97edb195f45c266c5a1bcdd3674825d926fd18cf
tree1e4bed465e6d78ebcd34a222497eb642ec4ebcef
parent82e4f39883932c1b1e5c7792a1be12dec6ab603d
parent141fdc763c2841b572d29a2ad78513e8d5325870
Merge commit '141fdc763c2841b572d29a2ad78513e8d5325870'

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

Conflicts:
libavformat/matroska.c

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