Use os/2 palette even if it contains less than 256 entries.

Fixes 11Bios13.bmp.
2014-07-04 21:23:53 +02:00 · 2014-07-04 21:23:53 +02:00 · 810294ce3d
parent 8f6a04a279
commit 810294ce3d
1 changed files with 2 additions and 0 deletions
--- a/libavcodec/bmp.c
+++ b/libavcodec/bmp.c
@ -248,6 +248,8 @@ static int bmp_decode_frame(AVCodecContext *avctx,
            } else if (t) {
                colors = t;
            }
+        } else {
+            colors = FFMIN(256, (hsize-ihsize-14) / 3);
        }
        buf = buf0 + 14 + ihsize; //palette location
        // OS/2 bitmap, 3 bytes per palette entry