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

bmpdec: support for rgb444 with bitfields compression 

Do not display garbage for invalid/unsupported bitfields values.
This commit is contained in:
Paul B Mahol 2012-01-09 23:12:40 +00:00
parent 93d49cba7f
commit a6839c4e60
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/bmp.c
View File

@ -163,8 +163,18 @@ static int bmp_decode_frame(AVCodecContext *avctx,
case 16: case 16:
if(comp == BMP_RGB) if(comp == BMP_RGB)
avctx->pix_fmt = PIX_FMT_RGB555; avctx->pix_fmt = PIX_FMT_RGB555;
if(comp == BMP_BITFIELDS) else if (comp == BMP_BITFIELDS) {
avctx->pix_fmt = rgb[1] == 0x07E0 ? PIX_FMT_RGB565 : PIX_FMT_RGB555; if (rgb[0] == 0xF800 && rgb[1] == 0x07E0 && rgb[2] == 0x001F)
avctx->pix_fmt = PIX_FMT_RGB565;
else if (rgb[0] == 0x7C00 && rgb[1] == 0x03E0 && rgb[2] == 0x001F)
avctx->pix_fmt = PIX_FMT_RGB555;
else if (rgb[0] == 0x0F00 && rgb[1] == 0x00F0 && rgb[2] == 0x000F)
avctx->pix_fmt = PIX_FMT_RGB444;
else {
av_log(avctx, AV_LOG_ERROR, "Unknown bitfields %0X %0X %0X\n", rgb[0], rgb[1], rgb[2]);
return AVERROR(EINVAL);
}
}
break; break;
case 8: case 8:
if(hsize - ihsize - 14 > 0) if(hsize - ihsize - 14 > 0)