diff options
author | Andreas Öman <andreas@lonelycoder.com> | 2010-04-14 20:15:50 +0000 |
---|---|---|
committer | Andreas Öman <andreas@lonelycoder.com> | 2010-04-14 20:15:50 +0000 |
commit | 67d96fb42d01d4ed5fe6f88b080b53606341beb4 (patch) | |
tree | 11fd2f20797329b92f2e63f1e5c85054fdc73d4a /libavcodec/pngdec.c | |
parent | 4744f896e5290d30539b3531c017d574847cdd59 (diff) | |
download | ffmpeg-67d96fb42d01d4ed5fe6f88b080b53606341beb4.tar.gz |
pngdec: Add support for PIX_FMT_Y400A
Originally committed as revision 22882 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/pngdec.c')
-rw-r--r-- | libavcodec/pngdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index aa05ff020b..03859a9913 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -489,6 +489,8 @@ static int decode_frame(AVCodecContext *avctx, avctx->pix_fmt = PIX_FMT_MONOBLACK; } else if (s->color_type == PNG_COLOR_TYPE_PALETTE) { avctx->pix_fmt = PIX_FMT_PAL8; + } else if (s->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { + avctx->pix_fmt = PIX_FMT_Y400A; } else { goto fail; } |