Fixes #5602 and #5603.
Signed-off-by: Paul B Mahol <one...@gmail.com>
---
libavformat/wavdec.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index 7176cd6..9f760c1 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -560,6 +560,19 @@ break_loop:
if (sample_count)
st->duration = sample_count;
+ if (st->codecpar->codec_id == AV_CODEC_ID_PCM_S32LE &&
+ st->codecpar->block_align == st->codecpar->channels * 4 &&
+ st->codecpar->bits_per_coded_sample == 32 &&
+ st->codecpar->extradata_size == 2 &&
+ AV_RL16(st->codecpar->extradata) == 1) {
+ st->codecpar->codec_id = AV_CODEC_ID_PCM_F16LE;
+ st->codecpar->bits_per_coded_sample = 16;
+ } else if (st->codecpar->codec_id == AV_CODEC_ID_PCM_S24LE &&
+ st->codecpar->block_align == st->codecpar->channels * 4 &&
+ st->codecpar->bits_per_coded_sample == 24) {
+ st->codecpar->codec_id = AV_CODEC_ID_PCM_F24LE;
+ }
+
ff_metadata_conv_ctx(s, NULL, wav_metadata_conv);
ff_metadata_conv_ctx(s, NULL, ff_riff_info_conv);
--
2.5.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
