OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6778f9d
)
Support decoding 56 byte BMP Bitmap Information Header.
author
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Thu, 8 Dec 2011 01:14:36 +0000
(
02:14
+0100)
committer
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Thu, 8 Dec 2011 01:45:53 +0000
(
02:45
+0100)
Fixes ticket #719.
libavcodec/bmp.c
patch
|
blob
|
history
diff --git
a/libavcodec/bmp.c
b/libavcodec/bmp.c
index
5971145
..
e97f6ed
100644
(file)
--- a/
libavcodec/bmp.c
+++ b/
libavcodec/bmp.c
@@
-92,7
+92,8
@@
static int bmp_decode_frame(AVCodecContext *avctx,
}
switch(ihsize){
- case 40: // windib v3
+ case 40: // windib
+ case 56: // windib v3
case 64: // OS/2 v2
case 108: // windib v4
case 124: // windib v5
@@
-115,7
+116,7
@@
static int bmp_decode_frame(AVCodecContext *avctx,
depth = bytestream_get_le16(&buf);
- if(ihsize == 40 || ihsize == 64)
+ if(ihsize == 40 || ihsize == 64
|| ihsize == 56
)
comp = bytestream_get_le32(&buf);
else
comp = BMP_RGB;