From ef81f55ec7a95907ec0eb1cb8cbcc3c8fa68e2e6 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Mon, 29 Jul 2013 00:00:42 +0200 Subject: [PATCH] Revert "pnm: remove nonsense code" Breaks decoding pgms with 255 < maxval < 65535. Found-by: Carl Eugen Hoyos . This reverts commit a0348d0966a81a66f3a1bf061576b24d5296b933. (cherry picked from commit 768e40b451a459fefaceed6b1b3d6e70c93596ac) --- libavcodec/pnm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c index 13ecbb057f..e73f5a7acb 100644 --- a/libavcodec/pnm.c +++ b/libavcodec/pnm.c @@ -163,6 +163,8 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s) if (s->maxval >= 256) { if (avctx->pix_fmt == AV_PIX_FMT_GRAY8) { avctx->pix_fmt = AV_PIX_FMT_GRAY16BE; + if (s->maxval != 65535) + avctx->pix_fmt = AV_PIX_FMT_GRAY16; } else if (avctx->pix_fmt == AV_PIX_FMT_RGB24) { avctx->pix_fmt = AV_PIX_FMT_RGB48BE; } else {