virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

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

Browse Source 
Fixes 11Bios13.bmp.
This commit is contained in:
Carl Eugen Hoyos 2014-07-04 21:23:53 +02:00
parent 8f6a04a279
commit 810294ce3d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/bmp.c
View File

@ -248,6 +248,8 @@ static int bmp_decode_frame(AVCodecContext *avctx,
} else if (t) { } else if (t) {
colors = t; colors = t;
} }
} else {
colors = FFMIN(256, (hsize-ihsize-14) / 3);
} }
buf = buf0 + 14 + ihsize; //palette location buf = buf0 + 14 + ihsize; //palette location
// OS/2 bitmap, 3 bytes per palette entry // OS/2 bitmap, 3 bytes per palette entry