Merge commit '696a74e81560889ef2fde76b045c5158a325a7a5' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 4 May 2014 21:45:24 +0000 (23:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 4 May 2014 21:45:24 +0000 (23:45 +0200)
* commit '696a74e81560889ef2fde76b045c5158a325a7a5':
  matroska: add the Opus mapping

Conflicts:
libavformat/matroska.c

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

Simple merge