From a0348d0966a81a66f3a1bf061576b24d5296b933 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Sun, 4 Nov 2012 23:17:12 +0000 Subject: pnm: remove nonsense code If maxval is more than 255 than each value takes 2 bytes with most significant byte first. Signed-off-by: Paul B Mahol --- libavcodec/pnm.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'libavcodec/pnm.c') diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c index c5c600b841..1baf1a7d6c 100644 --- a/libavcodec/pnm.c +++ b/libavcodec/pnm.c @@ -163,8 +163,6 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s) if (s->maxval >= 256) { if (avctx->pix_fmt == AV_PIX_FMT_GRAY8) { avctx->pix_fmt = AV_PIX_FMT_GRAY16BE; - if (s->maxval != 65535) - avctx->pix_fmt = AV_PIX_FMT_GRAY16; } else if (avctx->pix_fmt == AV_PIX_FMT_RGB24) { if (s->maxval > 255) avctx->pix_fmt = AV_PIX_FMT_RGB48BE; -- cgit v1.2.3