diff options
| author | Paul B Mahol <onemda@gmail.com> | 2017-01-17 15:54:57 +0100 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2017-01-19 00:37:26 +0100 |
| commit | 6c43f33ac2e7606b2013f6261144389589394196 (patch) | |
| tree | f1e1bba0257696d011e4577cba6a34cb7eafd21d /libavformat/wavdec.c | |
| parent | 90096e42e1e9c075a1991e592c5965cf3f643cd1 (diff) | |
| download | ffmpeg-6c43f33ac2e7606b2013f6261144389589394196.tar.gz | |
avcodec/wmaprodec: >2 channel support for XMA
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavformat/wavdec.c')
| -rw-r--r-- | libavformat/wavdec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index 987155e39e..4046809cf6 100644 --- 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); |