diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-11-12 19:30:27 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-11-12 19:30:27 +0100 |
| commit | 0c5fd6372e6c257912d7ae64cbfc4d8541f0452f (patch) | |
| tree | 705e06bd89db8d49de35c7ee78ba0ca248c217c6 /libavcodec/pngdec.c | |
| parent | 32dd67162af06d6621d1731580ed6ad5bc4087b7 (diff) | |
| download | ffmpeg-0c5fd6372e6c257912d7ae64cbfc4d8541f0452f.tar.gz | |
Do not try to read 16bit gray png files with alpha channel.
FFmpeg does not support gray16a.
Fixes the crash in ticket #644.
Diffstat (limited to 'libavcodec/pngdec.c')
| -rw-r--r-- | libavcodec/pngdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index c8688d6449..609b21e2aa 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -498,7 +498,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) { + } else if (s->bit_depth == 8 && + s->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { avctx->pix_fmt = PIX_FMT_GRAY8A; } else { goto fail; |