From ac8d6f120da3f342cd0fc8af35d9633dbaddcfe5 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Fri, 13 May 2011 02:03:18 +0200 Subject: [PATCH] tiffenc: factorize code for monow/monob case in encode_frame() switch Reduce code duplication, increase robustness. --- libavcodec/tiffenc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c index d0614f5faf..2d3442943a 100644 --- a/libavcodec/tiffenc.c +++ b/libavcodec/tiffenc.c @@ -255,12 +255,9 @@ static int encode_frame(AVCodecContext * avctx, unsigned char *buf, s->photometric_interpretation = 3; break; case PIX_FMT_MONOBLACK: - s->bpp = 1; - s->photometric_interpretation = 1; - break; case PIX_FMT_MONOWHITE: s->bpp = 1; - s->photometric_interpretation = 0; + s->photometric_interpretation = avctx->pix_fmt == PIX_FMT_MONOBLACK; break; case PIX_FMT_YUV420P: case PIX_FMT_YUV422P: