har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  rpza: limit the number of blocks to the total remaining blocks in the frame

See: 3819db745da2ac7fb3faacb116788c32f4753f34
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-10 21:02:35 +01:00
commit dfc99ca04d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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) { switch (opcode & 0xe0) {
/* Skip blocks */ /* Skip blocks */