From a44b63f6c8bee7cb08f4b96408ce4f5a39326097 Mon Sep 17 00:00:00 2001 From: ami_stuff Date: Thu, 5 Jan 2012 20:58:24 +0100 Subject: [PATCH] Support 48bpp pam decoding. Fixes ticket #882. --- libavcodec/pnm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c index 06ab7018ca..791829b737 100644 --- a/libavcodec/pnm.c +++ b/libavcodec/pnm.c @@ -122,9 +122,7 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s) if (maxval < 256) { avctx->pix_fmt = PIX_FMT_RGB24; } else { - av_log(avctx, AV_LOG_ERROR, "16-bit components are only supported for grayscale\n"); - avctx->pix_fmt = PIX_FMT_NONE; - return -1; + avctx->pix_fmt = PIX_FMT_RGB48BE; } } else if (depth == 4) { avctx->pix_fmt = PIX_FMT_RGB32;