From 001821904e316b68c42d1671dcf963e5f7c648f7 Mon Sep 17 00:00:00 2001 From: Peter Ross Date: Sun, 22 Feb 2009 00:56:55 +0000 Subject: Support 48-bit RGB PPM image. Originally committed as revision 17511 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/pnm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libavcodec/pnm.c') diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c index ba169d1473..4843d14653 100644 --- a/libavcodec/pnm.c +++ b/libavcodec/pnm.c @@ -138,8 +138,11 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s){ avctx->pix_fmt = PIX_FMT_GRAY16BE; if (s->maxval != 65535) avctx->pix_fmt = PIX_FMT_GRAY16; + } if (avctx->pix_fmt == PIX_FMT_RGB24) { + if (s->maxval > 255) + avctx->pix_fmt = PIX_FMT_RGB48BE; } else { - av_log(avctx, AV_LOG_ERROR, "16-bit components are only supported for grayscale\n"); + av_log(avctx, AV_LOG_ERROR, "Unsupported pixel format\n"); avctx->pix_fmt = PIX_FMT_NONE; return -1; } -- cgit v1.2.3