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

[Piotr Bandurski]

ffmpeg | branch: master | Piotr Bandurski <ami_stuff at o2.pl> | Sat Nov 24 10:54:38 2012 +0100| [6d6bf250dd46d408a1c3ba0d4b0acc9087e9a277] | committer: Carl Eugen Hoyos

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6d6bf250dd46d408a1c3ba0d4b0acc9087e9a277
---

 libavformat/riff.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/riff.c b/libavformat/riff.c
index 89296e8..9a37760 100644
--- 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;