[FFmpeg-cvslog] Merge commit '141fdc763c2841b572d29a2ad78513e8d5325870'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May  1 15:59:01 2014 +0200| [97edb195f45c266c5a1bcdd3674825d926fd18cf] | committer: Michael Niedermayer

Merge commit '141fdc763c2841b572d29a2ad78513e8d5325870'

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

Conflicts:
	libavformat/matroska.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=97edb195f45c266c5a1bcdd3674825d926fd18cf
---