diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-11-12 19:30:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-18 21:05:12 +0100 |
| commit | 00d35e82b2500f69db9d482db76e8c2f53521f2d (patch) | |
| tree | f453c6b13e1b4e06f3e8e6387bc72d9fe4644092 | |
| parent | 807342e1cfe8a33dbe929d896d56725f88514324 (diff) | |
| download | ffmpeg-00d35e82b2500f69db9d482db76e8c2f53521f2d.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.
(cherry picked from commit 0c5fd6372e6c257912d7ae64cbfc4d8541f0452f)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -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 05ba027802..f8ebb1b02d 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -471,7 +471,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; |