Support 16bpp grayscale pam decoding.

Fixes ticket #881.

Support 16bpp grayscale pam decoding.
Fixes ticket #881.
871e2f4f · ami_stuff · Carl Eugen Hoyos · 02026d08 · 871e2f4f
Commit 871e2f4f authored Jan 05, 2012 by ami_stuff Committed by Carl Eugen Hoyos Jan 05, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

pnm.c libavcodec/pnm.c +5 -2

No files found.
--- a/libavcodec/pnm.c
+++ b/libavcodec/pnm.c
@@ -111,10 +111,13 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s)
        avctx->height = h;
        s->maxval     = maxval;
        if (depth == 1) {
-            if (maxval == 1)
+            if (maxval == 1) {
                avctx->pix_fmt = PIX_FMT_MONOWHITE;
-            else
+           } else if (maxval == 255) {
                avctx->pix_fmt = PIX_FMT_GRAY8;
+           } else {
+                avctx->pix_fmt = PIX_FMT_GRAY16BE;
+            }
        } else if (depth == 3) {
            if (maxval < 256) {
            avctx->pix_fmt = PIX_FMT_RGB24;