]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
wma_decode_superframe always returns s->block_align, so make
authorreimar <reimar@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Fri, 30 Nov 2007 21:51:34 +0000 (21:51 +0000)
committerreimar <reimar@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Fri, 30 Nov 2007 21:51:34 +0000 (21:51 +0000)
sure we actually consume exactly that amount.
Fixes sound artefacts (mostly blips) that mysteriously disappeared
after e.g. remuxing with mencoder.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@11115 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavcodec/wmadec.c

index 1573e5d7838f70b2c4f05da8f200fc657867d22b..740f8b34ea60ffa8646a61c62ff10b472ca62c76 100644 (file)
@@ -768,6 +768,9 @@ static int wma_decode_superframe(AVCodecContext *avctx,
         s->last_superframe_len = 0;
         return 0;
     }
+    if (buf_size < s->block_align)
+        return 0;
+    buf_size = s->block_align;
 
     samples = data;