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/cscd.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/cscd.c')
-rw-r--r-- | libavcodec/cscd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/cscd.c b/libavcodec/cscd.c index 2999d443c5..ada6a712a3 100644 --- a/libavcodec/cscd.c +++ b/libavcodec/cscd.c @@ -217,19 +217,19 @@ static av_cold int decode_init(AVCodecContext *avctx) { if (avcodec_check_dimensions(avctx, avctx->height, avctx->width) < 0) { return 1; } - switch (avctx->bits_per_sample) { + switch (avctx->bits_per_coded_sample) { 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, "CamStudio codec error: invalid depth %i bpp\n", - avctx->bits_per_sample); + avctx->bits_per_coded_sample); return 1; } - c->bpp = avctx->bits_per_sample; + c->bpp = avctx->bits_per_coded_sample; c->pic.data[0] = NULL; - c->linelen = avctx->width * avctx->bits_per_sample / 8; + c->linelen = avctx->width * avctx->bits_per_coded_sample / 8; c->height = avctx->height; c->decomp_size = c->height * c->linelen; c->decomp_buf = av_malloc(c->decomp_size + LZO_OUTPUT_PADDING); |