diff --git a/libavcodec/dv.c b/libavcodec/dv.c
index 30e0b1da5513470b4613f9e2d48779aab37ec381..816ccae2694879db7463b7827ab93eb0efc66514 100644
--- a/libavcodec/dv.c
+++ b/libavcodec/dv.c
@@ -360,8 +360,8 @@ static inline void dv_decode_video_segment(DVVideoContext *s,
     const uint8_t *buf_ptr;
     PutBitContext pb, vs_pb;
     GetBitContext gb;
-    BlockInfo mb_data[5 * 6], *mb, *mb1;
-    DECLARE_ALIGNED_16(DCTELEM, sblock[5*6][64]);
+    BlockInfo mb_data[5 * DV_MAX_BPM], *mb, *mb1;
+    DECLARE_ALIGNED_16(DCTELEM, sblock[5*DV_MAX_BPM][64]);
     DECLARE_ALIGNED_8(uint8_t, mb_bit_buffer[80 + 4]); /* allow some slack */
     DECLARE_ALIGNED_8(uint8_t, vs_bit_buffer[5 * 80 + 4]); /* allow some slack */
     const int log2_blocksize= 3-s->avctx->lowres;
diff --git a/libavcodec/dvdata.h b/libavcodec/dvdata.h
index c725e1a76516201ee05f07923696f80cececba3e..48ddfccd7a6eb7acc5340c3937ccec8fb24df69a 100644
--- a/libavcodec/dvdata.h
+++ b/libavcodec/dvdata.h
@@ -2638,6 +2638,9 @@ enum dv_pack_type {
 /* largest possible DV frame, in bytes (PAL 50Mbps) */
 #define DV_MAX_FRAME_SIZE 288000
 
+/* maximum number of blocks per macroblock in any DV format */
+#define DV_MAX_BPM 8
+
 static inline const DVprofile* dv_frame_profile(const uint8_t* frame)
 {
     if ((frame[3] & 0x80) == 0) {      /* DSF flag */