# HG changeset patch
# User michael
# Date 1067161785 0
# Node ID bc4b13ca74deeb399fb64f9d8d102f04ff7eefdd
# Parent  f16ae8e69bd9e9ec9a459f0c33896c5f1112fa01
block algn patch by ("Assaf Yaari" <assafy at mobixell dot com>)

diff -r f16ae8e69bd9 -r bc4b13ca74de adpcm.c
--- a/adpcm.c	Sat Oct 25 21:59:28 2003 +0000
+++ b/adpcm.c	Sun Oct 26 09:49:45 2003 +0000
@@ -524,12 +524,9 @@
         }
         break;
     case CODEC_ID_ADPCM_IMA_WAV:
-        if (buf_size > BLKSIZE) {
-            if (avctx->block_align != 0)
-                buf_size = avctx->block_align;
-            else
-                buf_size = BLKSIZE;
-        }
+        if (avctx->block_align != 0 && buf_size > avctx->block_align)
+            buf_size = avctx->block_align;
+
 	// XXX: do as per-channel loop
         cs = &(c->status[0]);
         cs->predictor = (*src++) & 0x0FF;
@@ -605,13 +602,8 @@
 
         break;
     case CODEC_ID_ADPCM_MS:
-
-        if (buf_size > BLKSIZE) {
-            if (avctx->block_align != 0)
-                buf_size = avctx->block_align;
-            else
-                buf_size = BLKSIZE;
-        }
+        if (avctx->block_align != 0 && buf_size > avctx->block_align)
+            buf_size = avctx->block_align;
         n = buf_size - 7 * avctx->channels;
         if (n < 0)
             return -1;