[FFmpeg-devel] [PATCH] tiffenc: factorize code for monow/monob case in encode_frame() switch

Stefano Sabatini stefano.sabatini-lala at poste.it
Fri May 13 02:18:16 CEST 2011


Reduce code duplication, increase robustness.
---
 libavcodec/tiffenc.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c
index d0614f5..2d34429 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:
-- 
1.7.2.3



More information about the ffmpeg-devel mailing list