Browse Source

Do not try to read 16bit gray png files with alpha channel.

FFmpeg does not support gray16a.
Fixes the crash in ticket #644.
tags/n0.9
Carl Eugen Hoyos 14 years ago
parent
commit
0c5fd6372e
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      libavcodec/pngdec.c

+ 2
- 1
libavcodec/pngdec.c View File

@@ -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;


Loading…
Cancel
Save