From 00430075bd0f06e4c6d9612f3a522255155b035b Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Tue, 17 Jan 2012 00:38:54 +0100 Subject: Support 64bit pam decoding. --- libavcodec/pnm.c | 3 +-- libavcodec/pnmdec.c | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c index 1defbc20e6..212ec06c21 100644 --- a/libavcodec/pnm.c +++ b/libavcodec/pnm.c @@ -131,8 +131,7 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s) if (maxval < 256) { avctx->pix_fmt = PIX_FMT_RGB32; } else { - av_log(avctx, AV_LOG_ERROR, "Unsupported bit depth\n"); - return -1; + avctx->pix_fmt = PIX_FMT_RGBA64BE; } } else { return -1; diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c index ee15126889..4060c4e3b5 100644 --- a/libavcodec/pnmdec.c +++ b/libavcodec/pnmdec.c @@ -58,6 +58,11 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data, switch (avctx->pix_fmt) { default: return -1; + case PIX_FMT_RGBA64BE: + n = avctx->width * 8; + components=4; + sample_len=16; + goto do_read; case PIX_FMT_RGB48BE: n = avctx->width * 6; components=3; -- cgit v1.2.3