virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

bmp: unbreak non BMP_RGB compression for v4 and v5

Browse Source 
Fixes CID733728 & CID733729.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2012-10-11 17:56:04 +00:00
parent 9ad1ea13e0
commit 313b40efbd
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/bmp.c
View File

@ -118,7 +118,7 @@ static int bmp_decode_frame(AVCodecContext *avctx,
depth = bytestream_get_le16(&buf); depth = bytestream_get_le16(&buf);
if(ihsize == 40 || ihsize == 64 || ihsize == 56) if (ihsize >= 40)
comp = bytestream_get_le32(&buf); comp = bytestream_get_le32(&buf);
else else
comp = BMP_RGB; comp = BMP_RGB;
@ -133,8 +133,7 @@ static int bmp_decode_frame(AVCodecContext *avctx,
rgb[0] = bytestream_get_le32(&buf); rgb[0] = bytestream_get_le32(&buf);
rgb[1] = bytestream_get_le32(&buf); rgb[1] = bytestream_get_le32(&buf);
rgb[2] = bytestream_get_le32(&buf); rgb[2] = bytestream_get_le32(&buf);
if (ihsize >= 108) alpha = bytestream_get_le32(&buf);
alpha = bytestream_get_le32(&buf);
} }
avctx->width = width; avctx->width = width;