diff options
| author | Paul B Mahol <onemda@gmail.com> | 2012-01-09 23:37:24 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2012-01-10 05:58:19 -0800 |
| commit | 353a2d2164c09740e42f33014c4773b93e96a0d2 (patch) | |
| tree | 6086c1831910a2f316294f9e3b1b2ef91ed7c3ea /libavcodec/bmp.c | |
| parent | 0b8b3387a977dcdb6fb9e53bcc9966d34b2e4cec (diff) | |
| download | ffmpeg-353a2d2164c09740e42f33014c4773b93e96a0d2.tar.gz | |
bmpdec: support for rgb444 with bitfields compression
Do not display garbage for invalid/unsupported bitfields values.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libavcodec/bmp.c')
| -rw-r--r-- | libavcodec/bmp.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c index f438d10613..1f725f5369 100644 --- a/libavcodec/bmp.c +++ b/libavcodec/bmp.c @@ -162,8 +162,18 @@ static int bmp_decode_frame(AVCodecContext *avctx, case 16: if(comp == BMP_RGB) avctx->pix_fmt = PIX_FMT_RGB555; - if(comp == BMP_BITFIELDS) - avctx->pix_fmt = rgb[1] == 0x07E0 ? PIX_FMT_RGB565 : PIX_FMT_RGB555; + else if (comp == BMP_BITFIELDS) { + 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; case 8: if(hsize - ihsize - 14 > 0) |