Merge commit '141fdc763c2841b572d29a2ad78513e8d5325870'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 13:59:01 +0000 (15:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 14:03:30 +0000 (16:03 +0200)
* commit '141fdc763c2841b572d29a2ad78513e8d5325870':
  matroska: add the Opus mapping

Conflicts:
libavformat/matroska.c

See: 30549294ef0f796d48b1ffa482bd9315d4dbb83c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/matroska.c

index e8e9996..d281ef4 100644 (file)
@@ -35,7 +35,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_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},