Mercurial > libavcodec.hg

changeset 10845:f17f2be8f61a libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix two RLE buffer size calculations in TSCC decoder. Spotted by Zhongtuan Ma.
author kostya
date Mon, 11 Jan 2010 14:21:53 +0000
parents 7f9d077af2e4
children 8dbceaa5fa2f
files tscc.c
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tscc.c	Mon Jan 11 10:54:59 2010 +0000
+++ b/tscc.c	Mon Jan 11 14:21:53 2010 +0000
@@ -107,7 +107,7 @@
 
 
     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 @@
              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) {