Mercurial > libavcodec.hg
comparison zmbv.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 | 2acf0ae7b041 |
comparison
equal
deleted
inserted
replaced
7822:67cfe4983e6d | 7823:4525dcd81357 |
---|---|
601 c->height = avctx->height; | 601 c->height = avctx->height; |
602 | 602 |
603 if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) { | 603 if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) { |
604 return 1; | 604 return 1; |
605 } | 605 } |
606 c->bpp = avctx->bits_per_sample; | 606 c->bpp = avctx->bits_per_coded_sample; |
607 | 607 |
608 // Needed if zlib unused or init aborted before inflateInit | 608 // Needed if zlib unused or init aborted before inflateInit |
609 memset(&(c->zstream), 0, sizeof(z_stream)); | 609 memset(&(c->zstream), 0, sizeof(z_stream)); |
610 | 610 |
611 avctx->pix_fmt = PIX_FMT_RGB24; | 611 avctx->pix_fmt = PIX_FMT_RGB24; |