From febf75f3d2e4335652e6e40ef3427ec019d45aa8 Mon Sep 17 00:00:00 2001 From: ami_stuff Date: Fri, 6 Jan 2012 01:25:54 +0100 Subject: pam: Reject 64bpp rgba. Fixes ticket #883 --- libavcodec/pnm.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'libavcodec/pnm.c') diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c index 791829b737..ac451ca5ed 100644 --- a/libavcodec/pnm.c +++ b/libavcodec/pnm.c @@ -125,7 +125,12 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s) avctx->pix_fmt = PIX_FMT_RGB48BE; } } else if (depth == 4) { - avctx->pix_fmt = PIX_FMT_RGB32; + if (maxval < 256) { + avctx->pix_fmt = PIX_FMT_RGB32; + } else { + av_log(avctx, AV_LOG_ERROR, "Unsupported bit depth\n"); + return -1; + } } else { return -1; } -- cgit v1.2.3