tiffenc: factorize code for monow/monob case in encode_frame() switch

Reduce code duplication, increase robustness.
14 years ago · ac8d6f120d
parent 995013ebc8
commit ac8d6f120d
1 changed files with 1 additions and 4 deletions
--- 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: