avcodec/wmaprodec: >2 channel support for XMA

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avcodec/wmaprodec: >2 channel support for XMA
Signed-off-by: Paul B Mahol <onemda@gmail.com>
6c43f33a · Paul B Mahol · 90096e42 · 6c43f33a · 6c43f33a
Commit 6c43f33a authored Jan 17, 2017 by Paul B Mahol
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 204 additions and 73 deletions

wmaprodec.c libavcodec/wmaprodec.c +201 -73

wavdec.c libavformat/wavdec.c +3 -0

No files found.
--- a/libavcodec/wmaprodec.c
+++ b/libavcodec/wmaprodec.c
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -567,6 +567,9 @@ break_loop:
               st->codecpar->block_align == st->codecpar->channels * 4 &&
               st->codecpar->bits_per_coded_sample == 24) {
        st->codecpar->codec_id = AV_CODEC_ID_PCM_F24LE;
+    } else if (st->codecpar->codec_id == AV_CODEC_ID_XMA1 ||
+               st->codecpar->codec_id == AV_CODEC_ID_XMA2) {
+        st->codecpar->block_align = 2048;
    }

    ff_metadata_conv_ctx(s, NULL, wav_metadata_conv);