diff options
| author | ami_stuff <ami_stuff@o2.pl> | 2012-01-05 20:58:24 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-01-05 20:58:24 +0100 |
| commit | a44b63f6c8bee7cb08f4b96408ce4f5a39326097 (patch) | |
| tree | 554650e22e68c230cb44fabbe6e537b23dd34e53 | |
| parent | 871e2f4fac18230abe4d7154d90cb5cba1479692 (diff) | |
| download | ffmpeg-a44b63f6c8bee7cb08f4b96408ce4f5a39326097.tar.gz | |
Support 48bpp pam decoding.
Fixes ticket #882.
| -rw-r--r-- | libavcodec/pnm.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c index 06ab7018ca..791829b737 100644 --- 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; |