riff: fix decoding of 24-bit packed int (type 1, 20-bit)

6d6bf250 · Piotr Bandurski · Carl Eugen Hoyos · 95903e3c · 6d6bf250
Commit 6d6bf250 authored Nov 24, 2012 by Piotr Bandurski Committed by Carl Eugen Hoyos Nov 24, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

riff.c libavformat/riff.c +2 -1

No files found.
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -759,7 +759,8 @@ enum AVCodecID ff_wav_codec_get_id(unsigned int tag, int bps)
    /* handle specific u8 codec */
    if (id == AV_CODEC_ID_PCM_S16LE && bps == 8)
        id = AV_CODEC_ID_PCM_U8;
-    if (id == AV_CODEC_ID_PCM_S16LE && bps == 24)
+    if (id == AV_CODEC_ID_PCM_S16LE && bps == 20 ||
+        id == AV_CODEC_ID_PCM_S16LE && bps == 24)
        id = AV_CODEC_ID_PCM_S24LE;
    if (id == AV_CODEC_ID_PCM_S16LE && bps == 32)
        id = AV_CODEC_ID_PCM_S32LE;