diff options
| author | Paul B Mahol <onemda@gmail.com> | 2012-11-04 23:33:17 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2012-11-04 23:33:17 +0000 |
| commit | ae5ecb8e60ad888f94a0792c681dca8916c127bf (patch) | |
| tree | d60009c4e0a703587a274fc749b75054a24f41ef | |
| parent | e82afa3e2d633299fb62487dbd29596341ee628c (diff) | |
| download | ffmpeg-ae5ecb8e60ad888f94a0792c681dca8916c127bf.tar.gz | |
pnm: remove duplicated check for maxval > 255
Signed-off-by: Paul B Mahol <onemda@gmail.com>
| -rw-r--r-- | libavcodec/pnm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c index 1baf1a7d6c..91efbe40d6 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; |