RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix some 1bit png samples, they can be palettised. 

Fixes ticket #767.
This commit is contained in:
Carl Eugen Hoyos 2011-12-27 18:17:57 +01:00
parent 440e984b71
commit 613cbf3168
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/pngdec.c
View File

@ -494,10 +494,10 @@ static int decode_frame(AVCodecContext *avctx,
} else if (s->bit_depth == 16 &&
s->color_type == PNG_COLOR_TYPE_RGB) {
avctx->pix_fmt = PIX_FMT_RGB48BE;
} else if (s->bit_depth == 1) {
avctx->pix_fmt = PIX_FMT_MONOBLACK;
} else if (s->color_type == PNG_COLOR_TYPE_PALETTE) {
avctx->pix_fmt = PIX_FMT_PAL8;
} else if (s->bit_depth == 1) {
avctx->pix_fmt = PIX_FMT_MONOBLACK;
} else if (s->bit_depth == 8 &&
s->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
avctx->pix_fmt = PIX_FMT_GRAY8A;
@ -609,6 +609,23 @@ static int decode_frame(AVCodecContext *avctx,
}
exit_loop:
if(s->bits_per_pixel == 1 && s->color_type == PNG_COLOR_TYPE_PALETTE){
int i, j;
uint8_t *pd = s->current_picture->data[0];
for(j=0; j < s->height; j++) {
for(i=s->width/8-1; i>=0; i--) {
pd[8*i+7]= pd[i] &1;
pd[8*i+6]= (pd[i]>>1)&1;
pd[8*i+5]= (pd[i]>>2)&1;
pd[8*i+4]= (pd[i]>>3)&1;
pd[8*i+3]= (pd[i]>>4)&1;
pd[8*i+2]= (pd[i]>>5)&1;
pd[8*i+1]= (pd[i]>>6)&1;
pd[8*i+0]= pd[i]>>7;
}
pd += s->image_linesize;
}
}
if(s->bits_per_pixel == 2){
int i, j;
uint8_t *pd = s->current_picture->data[0];