[FFmpeg-cvslog] Simplify setting colour space for mono* when encoding tiff.

Carl Eugen Hoyos git at videolan.org
Fri Aug 31 11:15:54 CEST 2012


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Fri Aug 31 10:57:36 2012 +0200| [a5a90fa577cb3a73a20cd0f179f69a8f60c6a24f] | committer: Carl Eugen Hoyos

Simplify setting colour space for mono* when encoding tiff.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a5a90fa577cb3a73a20cd0f179f69a8f60c6a24f
---

 libavcodec/tiffenc.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c
index 883d6fb..3293740 100644
--- a/libavcodec/tiffenc.c
+++ b/libavcodec/tiffenc.c
@@ -272,14 +272,14 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
         avctx->bits_per_coded_sample = 0x28;
     case PIX_FMT_GRAY8A:
     case PIX_FMT_GRAY16LE:
+    case PIX_FMT_MONOBLACK:
         s->photometric_interpretation = 1;
         break;
     case PIX_FMT_PAL8:
         s->photometric_interpretation = 3;
         break;
-    case PIX_FMT_MONOBLACK:
     case PIX_FMT_MONOWHITE:
-        s->photometric_interpretation = avctx->pix_fmt == PIX_FMT_MONOBLACK;
+        s->photometric_interpretation = 0;
         break;
     case PIX_FMT_YUV420P:
     case PIX_FMT_YUV422P:



More information about the ffmpeg-cvslog mailing list