[FFmpeg-devel] [PATCH]Only read 8bit gray with alpha channel pngs

[Carl Eugen Hoyos]

Hi!

Attached fixes the crash described in ticket #644 for me.
The sample is 16bit gray with alpha channel.

Please comment, Carl Eugen
-------------- next part --------------
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index c8688d6..609b21e 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;