[FFmpeg-cvslog] Merge commit '79041d92ee7421853ee8c57fc13891cb0c272e0e' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun May  4 21:25:27 2014 +0200| [fa164406597e54d52102cfa5d3cb84c7a858c4b2] | committer: Michael Niedermayer

Merge commit '79041d92ee7421853ee8c57fc13891cb0c272e0e' into release/2.2

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

Conflicts:
	libavformat/matroska.c

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

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