[FFmpeg-cvslog] avcodec/pnmdec: support more pnm files

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Mon Jul 29 00:49:44 2013 +0200| [34d48dac252f8bb38fb34ea29fcb6b5313016391] | committer: Michael Niedermayer

avcodec/pnmdec: support more pnm files

Fixes Ticket1897

Some hunks that have become unneeded due to previous changes removed by the commiter.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/pnmdec.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c
index a7b91fd..df9b5ee 100644
--- a/libavcodec/pnmdec.c
+++ b/libavcodec/pnmdec.c
@@ -66,11 +66,15 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data,
         n = avctx->width * 8;
         components=4;
         sample_len=16;
+        if (s->maxval < 65535)
+            upgrade = 2;
         goto do_read;
     case AV_PIX_FMT_RGB48:
         n = avctx->width * 6;
         components=3;
         sample_len=16;
+        if (s->maxval < 65535)
+            upgrade = 2;
         goto do_read;
     case AV_PIX_FMT_RGBA:
         n = avctx->width * 4;
@@ -81,6 +85,8 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data,
         n = avctx->width * 3;
         components=3;
         sample_len=8;
+        if (s->maxval < 255)
+            upgrade = 1;
         goto do_read;
     case AV_PIX_FMT_GRAY8:
         n = avctx->width;