diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2010-01-11 14:21:53 +0000 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2010-01-11 14:21:53 +0000 |
| commit | eebece4641f224c8e1b7f9b764364237daf7b088 (patch) | |
| tree | 24e0a4290ca9f415e38c1ee15734f59a973beaeb /libavcodec | |
| parent | fd07f803b1bdbdaa46c3bac7cecfbdad6edd94f8 (diff) | |
| download | ffmpeg-eebece4641f224c8e1b7f9b764364237daf7b088.tar.gz | |
Fix two RLE buffer size calculations in TSCC decoder.
Spotted by Zhongtuan Ma.
Originally committed as revision 21138 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/tscc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c index b00b5c5568..bf82c6302b 100644 --- a/libavcodec/tscc.c +++ b/libavcodec/tscc.c @@ -107,7 +107,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac if(zret != Z_DATA_ERROR) - ff_msrle_decode(avctx, (AVPicture*)&c->pic, c->bpp, c->decomp_buf, c->zstream.avail_out); + ff_msrle_decode(avctx, (AVPicture*)&c->pic, c->bpp, c->decomp_buf, c->decomp_size - c->zstream.avail_out); /* make the palette available on the way out */ if (c->avctx->pix_fmt == PIX_FMT_PAL8) { @@ -154,7 +154,8 @@ static av_cold int decode_init(AVCodecContext *avctx) return -1; } c->bpp = avctx->bits_per_coded_sample; - c->decomp_size = (avctx->width * c->bpp + (avctx->width + 254) / 255 + 2) * avctx->height + 2;//RLE in the 'best' case + // buffer size for RLE 'best' case when 2-byte code preceeds each pixel and there may be padding after it too + c->decomp_size = (((avctx->width * c->bpp + 7) >> 3) + 3 * avctx->width + 2) * avctx->height + 2; /* Allocate decompression buffer */ if (c->decomp_size) { |