Browse Source

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>
tags/n2.2-rc1
Michael Niedermayer 12 years ago
parent
commit
dfc99ca04d
1 changed files with 2 additions and 0 deletions
  1. +2
    -0
      libavcodec/rpza.c

+ 2
- 0
libavcodec/rpza.c View File

@@ -119,6 +119,8 @@ static void rpza_decode_stream(RpzaContext *s)
}
}

n_blocks = FFMIN(n_blocks, total_blocks);

switch (opcode & 0xe0) {

/* Skip blocks */


Loading…
Cancel
Save