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)
* commit '79041d92ee7421853ee8c57fc13891cb0c272e0e':
  matroska: add the Opus mapping

Conflicts:
libavformat/matroska.c

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

@@@ -35,8 -32,7 +35,8 @@@ 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_OPUS"           , AV_CODEC_ID_OPUS},
 +    {"A_OPUS/EXPERIMENTAL",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},