Do not display garbage for invalid/unsupported bitfields values.
---
libavcodec/bmp.c | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c
index f438d106..1f725f5 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)
--
1.7.7
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
