[SCM] libav/master: matroska: add the Opus mapping

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 696a74e81560889ef2fde76b045c5158a325a7a5
Author: Anton Khirnov <anton at khirnov.net>
Date:   Sun Apr 27 13:40:11 2014 +0200

    matroska: add the Opus mapping
    
    (cherry picked from commit 141fdc763c2841b572d29a2ad78513e8d5325870)
    Signed-off-by: Reinhard Tartler <siretart at tauware.de>
    (cherry picked from commit 79041d92ee7421853ee8c57fc13891cb0c272e0e)

diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index edb7ab7..fe5d1c8 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -32,6 +32,7 @@ const CodecTags ff_mkv_codec_tags[]={
     {"A_MPEG/L2"        , AV_CODEC_ID_MP2},
     {"A_MPEG/L1"        , AV_CODEC_ID_MP2},
     {"A_MPEG/L3"        , AV_CODEC_ID_MP3},
+    {"A_OPUS"           , AV_CODEC_ID_OPUS},
     {"A_PCM/FLOAT/IEEE" , AV_CODEC_ID_PCM_F32LE},
     {"A_PCM/FLOAT/IEEE" , AV_CODEC_ID_PCM_F64LE},
     {"A_PCM/INT/BIG"    , AV_CODEC_ID_PCM_S16BE},

-- 
Libav/FFmpeg packaging