X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fmetasound.c;h=be47510d7a6f82c9a0e8507a121ac5e1b6b0e541;hb=a247ac640df3da573cd661065bf53f37863e2b46;hp=87cd7cb2110c11789002637d3d67072da38b3c61;hpb=762c2b5dcd99a08452299cd1f83070f88115f1f3;p=ffmpeg

diff --git a/libavcodec/metasound.c b/libavcodec/metasound.c
index 87cd7cb2110..be47510d7a6 100644
--- a/libavcodec/metasound.c
+++ b/libavcodec/metasound.c
@@ -341,22 +341,16 @@ static av_cold int metasound_decode_init(AVCodecContext *avctx)
         tctx->mtab = &ff_metasound_mode2224s;
         break;
     case (1 << 16) + (44 << 8) + 32:
-        tctx->mtab = &ff_metasound_mode4432;
-        break;
     case (2 << 16) + (44 << 8) + 32:
-        tctx->mtab = &ff_metasound_mode4432s;
+        tctx->mtab = &ff_metasound_mode4432;
         break;
     case (1 << 16) + (44 << 8) + 40:
-        tctx->mtab = &ff_metasound_mode4440;
-        break;
     case (2 << 16) + (44 << 8) + 40:
-        tctx->mtab = &ff_metasound_mode4440s;
+        tctx->mtab = &ff_metasound_mode4440;
         break;
     case (1 << 16) + (44 << 8) + 48:
-        tctx->mtab = &ff_metasound_mode4448;
-        break;
     case (2 << 16) + (44 << 8) + 48:
-        tctx->mtab = &ff_metasound_mode4448s;
+        tctx->mtab = &ff_metasound_mode4448;
         break;
     default:
         av_log(avctx, AV_LOG_ERROR,
@@ -376,7 +370,7 @@ static av_cold int metasound_decode_init(AVCodecContext *avctx)
     return ff_twinvq_decode_init(avctx);
 }
 
-AVCodec ff_metasound_decoder = {
+const AVCodec ff_metasound_decoder = {
     .name           = "metasound",
     .long_name      = NULL_IF_CONFIG_SMALL("Voxware MetaSound"),
     .type           = AVMEDIA_TYPE_AUDIO,
@@ -385,7 +379,7 @@ AVCodec ff_metasound_decoder = {
     .init           = metasound_decode_init,
     .close          = ff_twinvq_decode_close,
     .decode         = ff_twinvq_decode_frame,
-    .capabilities   = AV_CODEC_CAP_DR1,
+    .capabilities   = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF,
     .sample_fmts    = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
                                                       AV_SAMPLE_FMT_NONE },
 };