diff options
| author | Luca Abeni <lucabe72@email.it> | 2008-09-08 14:24:59 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-09-08 14:24:59 +0000 |
| commit | dd1c8f3e6e5380f993c86750bb09fd42e130143f (patch) | |
| tree | 2ae5b2bbda1b685069f4db6ed408097288590dde /libavcodec/tscc.c | |
| parent | 71375e05006e68fecdeb8d5fa80c3cce52a5cf86 (diff) | |
| download | ffmpeg-dd1c8f3e6e5380f993c86750bb09fd42e130143f.tar.gz | |
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!
Originally committed as revision 15262 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/tscc.c')
| -rw-r--r-- | libavcodec/tscc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c index 3c9adc0690..51f0185aa0 100644 --- a/libavcodec/tscc.c +++ b/libavcodec/tscc.c @@ -274,17 +274,17 @@ static av_cold int decode_init(AVCodecContext *avctx) 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 */ |