Merge remote-tracking branch 'qatar/master'

* qatar/master: rpza: limit the number of blocks to the total remaining blocks in the frame See: 3819db745d Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · dfc99ca04d
parent 996fdca8fb 77bb0004bb
commit dfc99ca04d
1 changed files with 2 additions and 0 deletions
--- 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 */