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:
244682d
)
xwddec: support 8bpp grayscale
author
Piotr Bandurski
<ami_stuff@o2.pl>
Sun, 24 Jun 2012 11:34:02 +0000
(11:34 +0000)
committer
Paul B Mahol
<onemda@gmail.com>
Sun, 24 Jun 2012 11:34:02 +0000
(11:34 +0000)
libavcodec/xwddec.c
patch
|
blob
|
history
diff --git
a/libavcodec/xwddec.c
b/libavcodec/xwddec.c
index
2879358
..
e6d4df4
100644
(file)
--- a/
libavcodec/xwddec.c
+++ b/
libavcodec/xwddec.c
@@
-157,10
+157,13
@@
static int xwd_decode_frame(AVCodecContext *avctx, void *data,
switch (vclass) {
case XWD_STATIC_GRAY:
case XWD_GRAY_SCALE:
- if (bpp != 1)
+ if (bpp != 1
&& bpp != 8
)
return AVERROR_INVALIDDATA;
- if (pixdepth == 1)
+ if (pixdepth == 1)
{
avctx->pix_fmt = PIX_FMT_MONOWHITE;
+ } else if (pixdepth == 8) {
+ avctx->pix_fmt = PIX_FMT_GRAY8;
+ }
break;
case XWD_STATIC_COLOR:
case XWD_PSEUDO_COLOR: