[FFmpeg-cvslog] Use os/2 palette even if it contains less than 256 entries.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Fri Jul  4 21:23:53 2014 +0200| [810294ce3d3d9cceb3670a938379e2b2cba6cdc9] | committer: Carl Eugen Hoyos

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

Fixes 11Bios13.bmp.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=810294ce3d3d9cceb3670a938379e2b2cba6cdc9
---

 libavcodec/bmp.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c
index ec4c467..458fd0c 100644
--- 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