Merge commit '141fdc763c2841b572d29a2ad78513e8d5325870'

* commit '141fdc763c2841b572d29a2ad78513e8d5325870': matroska: add the Opus mapping Conflicts: libavformat/matroska.c See: 30549294ef Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 97edb195f4
parent 82e4f39883 141fdc763c
commit 97edb195f4
1 changed files with 1 additions and 1 deletions
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@ -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},