diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-10 21:02:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-10 21:28:38 +0100 |
| commit | dfc99ca04d7698b8f4101dd4f017c1b023ad95f8 (patch) | |
| tree | f9b59e8df8e3bdcdaefb1fb7dcf66c8a52035878 | |
| parent | 996fdca8fbc10074e3b55cfa5c9eb346d324c29d (diff) | |
| parent | 77bb0004bbe18f1498cfecdc68db5f10808b6599 (diff) | |
Merge remote-tracking branch 'qatar/master'
* 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>
| -rw-r--r-- | libavcodec/rpza.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/rpza.c b/libavcodec/rpza.c index 47de9ccce1..aac437e41c 100644 --- 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 */ |