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

Fixes 11Bios13.bmp.

Use os/2 palette even if it contains less than 256 entries.
Fixes 11Bios13.bmp.
810294ce · Carl Eugen Hoyos · 8f6a04a2 · 810294ce
Commit 810294ce authored Jul 04, 2014 by Carl Eugen Hoyos
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

bmp.c libavcodec/bmp.c +2 -0

No files found.
--- 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