diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-07 13:37:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-07 13:50:24 +0200 |
| commit | fa8511851090537f6898fc50d7e6cf56841cf6ab (patch) | |
| tree | cc6e217fd99f5080a4726e1c74a6840962e1ff80 /libavcodec/mss2.c | |
| parent | a7fbc7d7b7eabc74ceb1970a995c56043315e433 (diff) | |
| parent | 9afb7061f938831248942050cfdb449e014ed427 (diff) | |
| download | ffmpeg-fa8511851090537f6898fc50d7e6cf56841cf6ab.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mov_chan: Pass a separate AVIOContext for reading
af_asyncts: check return value from lavr when flushing.
mss2: simplify loop in decode_rle()
mss12: avoid unnecessary division in arith*_get_bit()
mss2: do not try to read too many palette entries
mpegvideo: set AVFrame fields to NULL after freeing the base memory
configure: Set the right cc_e flags for msvc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mss2.c')
| -rw-r--r-- | libavcodec/mss2.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index fc9ebff4d7..ceb0a45fe5 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -161,7 +161,7 @@ static int decode_pal_v2(MSS12Context *ctx, const uint8_t *buf, int buf_size) return 0; ncol = *buf++; - if (buf_size < 2 + ncol * 3) + if (ncol > ctx->free_colours || buf_size < 2 + ncol * 3) return -1; for (i = 0; i < ncol; i++) *pal++ = AV_RB24(buf + 3 * i); @@ -335,8 +335,7 @@ static int decode_rle(GetBitContext *gb, uint8_t *pal_dst, int pal_stride, else repeat = get_bits(gb, b); - while (b--) - repeat += 1 << b; + repeat += (1 << b) - 1; if (last_symbol == -2) { int skip = FFMIN(repeat, pal_dst + w - pp); |