[FFmpeg-cvslog] pnm: remove duplicated check for maxval > 255

Paul B Mahol git at videolan.org
Mon Nov 5 00:38:46 CET 2012


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sun Nov  4 23:33:17 2012 +0000| [ae5ecb8e60ad888f94a0792c681dca8916c127bf] | committer: Paul B Mahol

pnm: remove duplicated check for maxval > 255

Signed-off-by: Paul B Mahol <onemda at gmail.com>

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

 libavcodec/pnm.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c
index 1baf1a7..91efbe4 100644
--- a/libavcodec/pnm.c
+++ b/libavcodec/pnm.c
@@ -164,8 +164,7 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s)
             if (avctx->pix_fmt == AV_PIX_FMT_GRAY8) {
                 avctx->pix_fmt = AV_PIX_FMT_GRAY16BE;
             } else if (avctx->pix_fmt == AV_PIX_FMT_RGB24) {
-                if (s->maxval > 255)
-                    avctx->pix_fmt = AV_PIX_FMT_RGB48BE;
+                avctx->pix_fmt = AV_PIX_FMT_RGB48BE;
             } else {
                 av_log(avctx, AV_LOG_ERROR, "Unsupported pixel format\n");
                 avctx->pix_fmt = AV_PIX_FMT_NONE;



More information about the ffmpeg-cvslog mailing list