Support 48bpp pam decoding.

Fixes ticket #882.

Support 48bpp pam decoding.
Fixes ticket #882.
a44b63f6 · ami_stuff · Carl Eugen Hoyos · 871e2f4f · a44b63f6
Commit a44b63f6 authored Jan 05, 2012 by ami_stuff Committed by Carl Eugen Hoyos Jan 05, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

pnm.c libavcodec/pnm.c +1 -3

No files found.
--- a/libavcodec/pnm.c
+++ b/libavcodec/pnm.c
@@ -122,9 +122,7 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s)
            if (maxval < 256) {
            avctx->pix_fmt = PIX_FMT_RGB24;
            } else {
-                av_log(avctx, AV_LOG_ERROR, "16-bit components are only supported for grayscale\n");
-                avctx->pix_fmt = PIX_FMT_NONE;
-                return -1;
+                avctx->pix_fmt = PIX_FMT_RGB48BE;
            }
        } else if (depth == 4) {
            avctx->pix_fmt = PIX_FMT_RGB32;