Merge commit '79041d92ee7421853ee8c57fc13891cb0c272e0e' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 4 May 2014 19:25:27 +0000 (21:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 4 May 2014 19:25:27 +0000 (21:25 +0200)
commitfa164406597e54d52102cfa5d3cb84c7a858c4b2
tree15fcd657211f71bf08099ee69fd76ad001a3360d
parentc36fd16aaa0bf67b2af254ef8324dc8d8ee9fca7
parent79041d92ee7421853ee8c57fc13891cb0c272e0e
Merge commit '79041d92ee7421853ee8c57fc13891cb0c272e0e' into release/2.2

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

Conflicts:
libavformat/matroska.c

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