Revert "pnm: remove nonsense code"

Breaks decoding pgms with 256 < maxval < 65535. Found-by: Carl Eugen Hoyos <cehoyos@ag.or.at>. This reverts commit a0348d0966.
12 years ago · 768e40b451
parent ac8e70d735
commit 768e40b451
1 changed files with 2 additions and 0 deletions
--- 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 if (avctx->pix_fmt == AV_PIX_FMT_YUV420P && s->maxval < 65536) {