Mercurial > libavcodec.hg
diff tscc.c @ 7823:4525dcd81357 libavcodec
Bump Major version, this commit is almost just renaming bits_per_sample to
bits_per_coded_sample but that cannot be done seperately.
Patch by Luca Abeni
Also reset the minor version and fix the forgotton change to libfaad.
Note: The API/ABI should not be considered stable yet, there still may
be a change done here or there if some developer has some cleanup ideas and
patches!
author | michael |
---|---|
date | Mon, 08 Sep 2008 14:24:59 +0000 |
parents | e943e1409077 |
children | f874e1d5cf07 |
line wrap: on
line diff
--- a/tscc.c Mon Sep 08 13:37:12 2008 +0000 +++ b/tscc.c Mon Sep 08 14:24:59 2008 +0000 @@ -274,17 +274,17 @@ av_log(avctx, AV_LOG_ERROR, "Zlib support not compiled.\n"); return 1; #endif - switch(avctx->bits_per_sample){ + switch(avctx->bits_per_coded_sample){ case 8: avctx->pix_fmt = PIX_FMT_PAL8; break; case 16: avctx->pix_fmt = PIX_FMT_RGB555; break; case 24: avctx->pix_fmt = PIX_FMT_BGR24; break; case 32: avctx->pix_fmt = PIX_FMT_RGB32; break; - default: av_log(avctx, AV_LOG_ERROR, "Camtasia error: unknown depth %i bpp\n", avctx->bits_per_sample); + default: av_log(avctx, AV_LOG_ERROR, "Camtasia error: unknown depth %i bpp\n", avctx->bits_per_coded_sample); return -1; } - c->bpp = avctx->bits_per_sample; + 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 /* Allocate decompression buffer */