diff --git a/libavcodec/atrac3plusdec.c b/libavcodec/atrac3plusdec.c
index f858497d46f60a4ce04f327c77c4cc76a53407bf..b4437f1a920a4b8bf9e63615badcc7424e97ce93 100644
--- a/libavcodec/atrac3plusdec.c
+++ b/libavcodec/atrac3plusdec.c
@@ -384,7 +384,7 @@ static int atrac3p_decode_frame(AVCodecContext *avctx, void *data,
 
     *got_frame_ptr = 1;
 
-    return avctx->block_align;
+    return FFMIN(avctx->block_align, avpkt->size);
 }
 
 AVCodec ff_atrac3p_decoder = {