Mercurial > libavcodec.hg
comparison cinepak.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 | bc36a075bf35 |
comparison
equal
deleted
inserted
replaced
7822:67cfe4983e6d | 7823:4525dcd81357 |
---|---|
393 s->width = (avctx->width + 3) & ~3; | 393 s->width = (avctx->width + 3) & ~3; |
394 s->height = (avctx->height + 3) & ~3; | 394 s->height = (avctx->height + 3) & ~3; |
395 s->sega_film_skip_bytes = -1; /* uninitialized state */ | 395 s->sega_film_skip_bytes = -1; /* uninitialized state */ |
396 | 396 |
397 // check for paletted data | 397 // check for paletted data |
398 if ((avctx->palctrl == NULL) || (avctx->bits_per_sample == 40)) { | 398 if ((avctx->palctrl == NULL) || (avctx->bits_per_coded_sample == 40)) { |
399 s->palette_video = 0; | 399 s->palette_video = 0; |
400 avctx->pix_fmt = PIX_FMT_YUV420P; | 400 avctx->pix_fmt = PIX_FMT_YUV420P; |
401 } else { | 401 } else { |
402 s->palette_video = 1; | 402 s->palette_video = 1; |
403 avctx->pix_fmt = PIX_FMT_PAL8; | 403 avctx->pix_fmt = PIX_FMT_PAL8; |