Merge commit 'a58873b11198d04670b7f98f5a8a749d742db7c5'

[ffmpeg] / libavcodec / qdrw.c

diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c
index 3a0bc6f760a9cf4e936cdb46988613a4135e6ce6..82cc528a30f2ddf21081374d81cf402987869d70 100644 (file)
--- a/libavcodec/qdrw.c
+++ b/libavcodec/qdrw.c
@@ -434,7 +434,7 @@ static int decode_frame(AVCodecContext *avctx,
             av_log(avctx, AV_LOG_DEBUG, "bppcount %d bpp %d\n", bppcnt, bpp);
             if (bppcnt == 3 && bpp == 8) {
                 avctx->pix_fmt = AV_PIX_FMT_RGB24;
-            } else if (bppcnt == 3 && bpp == 5) {
+            } else if (bppcnt == 3 && bpp == 5 || bppcnt == 2 && bpp == 8) {
                 avctx->pix_fmt = AV_PIX_FMT_RGB555;
             } else if (bppcnt == 4 && bpp == 8) {
                 avctx->pix_fmt = AV_PIX_FMT_ARGB;