[FFmpeg-cvslog] Support 48bpp pam decoding.

ami_stuff git at videolan.org
Thu Jan 5 20:59:08 CET 2012


ffmpeg | branch: master | ami_stuff <ami_stuff at o2.pl> | Thu Jan  5 20:58:24 2012 +0100| [a44b63f6c8bee7cb08f4b96408ce4f5a39326097] | committer: Carl Eugen Hoyos

Support 48bpp pam decoding.

Fixes ticket #882.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a44b63f6c8bee7cb08f4b96408ce4f5a39326097
---

 libavcodec/pnm.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c
index 06ab701..791829b 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;



More information about the ffmpeg-cvslog mailing list