avcodec/adpcm_ima_apm: support custom block size for encoding

Signed-off-by: Zane van Iperen <zane@zanevaniperen.com>

diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c
index 3d036e1f92a1552aea145ec8f1d120bf5fa6345c..f21edfc3e35c686eda0dfb8ba5afb07249623870 100644 (file)
--- a/libavcodec/adpcmenc.c
+++ b/libavcodec/adpcmenc.c
@@ -160,8 +160,8 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx)
         avctx->block_align = s->block_size;
         break;
     case AV_CODEC_ID_ADPCM_IMA_APM:
-        avctx->frame_size = BLKSIZE * 2 / avctx->channels;
-        avctx->block_align = BLKSIZE;
+        avctx->frame_size  = s->block_size * 2 / avctx->channels;
+        avctx->block_align = s->block_size;
 
         if (!(avctx->extradata = av_mallocz(28 + AV_INPUT_BUFFER_PADDING_SIZE)))
             return AVERROR(ENOMEM);