diff --git a/src/ADPCM.h b/src/ADPCM.h
index b1befad..12828ef 100644
--- a/src/ADPCM.h
+++ b/src/ADPCM.h
@@ -133,7 +133,7 @@ class ADPCMDecoder : public ADPCMCodec {
     avctx.priv_data = (uint8_t *)&enc_ctx;
   }
 
-  ADPCMDecoder(AVCodecID id, int blockSize = 256) : ADPCMCodec() {
+  ADPCMDecoder(AVCodecID id, int blockSize = ADAPCM_DEFAULT_BLOCK_SIZE) : ADPCMCodec() {
     setCodecID(id);
     setBlockSize(blockSize);
     avctx.bits_per_coded_sample = av_get_bits_per_sample(id);
@@ -162,7 +162,6 @@ class ADPCMDecoder : public ADPCMCodec {
     frame.extended_data = extended_data;
     // set result samples
     return adpcm_decode_init(&avctx) == 0;
-    ;
   }
 
   void end() { adpcm_flush(&avctx); }
diff --git a/src/adpcm-ffmpeg/config-adpcm.h b/src/adpcm-ffmpeg/config-adpcm.h
index 8f3b5fb..b2c01b3 100644
--- a/src/adpcm-ffmpeg/config-adpcm.h
+++ b/src/adpcm-ffmpeg/config-adpcm.h
@@ -1,7 +1,7 @@
 #pragma once
 
 // setting to 1 uses a ima wav decoder and encoder that does not use any macros and thus can be debugged
-#  define DEBUG 0
+#  define DEBUG 1
 
 #  define AV_HAVE_BIGENDIAN 0
 #  define CACHED_BITSTREAM_READER 0
diff --git a/test/test.cpp b/test/test.cpp
index 9955d84..46178db 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -13,9 +13,9 @@
 
 using namespace std;
 using namespace adpcm_ffmpeg;
-
-ADPCMDecoder decoder{AV_CODEC_ID_ADPCM_IMA_WAV};
-ADPCMEncoder encoder{AV_CODEC_ID_ADPCM_IMA_WAV};
+AVCodecID code = AV_CODEC_ID_ADPCM_MS; // AV_CODEC_ID_ADPCM_IMA_WAV
+ADPCMDecoder decoder{code};
+ADPCMEncoder encoder{code};
 vector<int16_t> frame_vector;
 SineWaveGenerator<int16_t> gen{30000.0};
 int channels = 2;