Merge commit 'd6a27f885b5d4cba7a82e50af423c741d2f37c3e'

[ffmpeg] / libavcodec / rpza.c

diff --git a/libavcodec/rpza.c b/libavcodec/rpza.c
index 47de9ccce1ebc15cc1ad70083d8c0cb0b3de2a82..aac437e41c949700cee13faf744aa80a9260a5c4 100644 (file)
--- a/libavcodec/rpza.c
+++ b/libavcodec/rpza.c
@@ -119,6 +119,8 @@ static void rpza_decode_stream(RpzaContext *s)
             }
         }
 
+        n_blocks = FFMIN(n_blocks, total_blocks);
+
         switch (opcode & 0xe0) {
 
         /* Skip blocks */