[FFmpeg-cvslog] Fix compilation of libavcodec/tiff.c

Carl Eugen Hoyos git at videolan.org
Sun Jun 2 16:51:54 CEST 2013


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sun Jun  2 16:50:39 2013 +0200| [a4b5863eeac0a74e9bbd77b88d02b3e26bbc1869] | committer: Carl Eugen Hoyos

Fix compilation of libavcodec/tiff.c

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

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

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 0ad12a1..15c384a 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -627,7 +627,7 @@ static int init_image(TiffContext *s, AVFrame *frame)
         s->avctx->pix_fmt = s->le ? AV_PIX_FMT_GRAY16LE : AV_PIX_FMT_GRAY16BE;
         break;
     case 162:
-        s->avctx->pix_fmt = s>planar ? AV_PIX_FMT_NONE : AV_PIX_FMT_GRAY8A;
+        s->avctx->pix_fmt = s->planar ? AV_PIX_FMT_NONE : AV_PIX_FMT_GRAY8A;
         break;
     case 324:
         s->avctx->pix_fmt = s->planar ? AV_PIX_FMT_GBRAP : AV_PIX_FMT_RGBA;
@@ -1206,7 +1206,7 @@ static int decode_frame(AVCodecContext *avctx,
     }
     }
 
-    if (s->planar && s->bpp_count > 2) {
+    if (s->planar && s->bppcount > 2) {
         FFSWAP(uint8_t*, p->data[0],     p->data[2]);
         FFSWAP(int,      p->linesize[0], p->linesize[2]);
         FFSWAP(uint8_t*, p->data[0],     p->data[1]);



More information about the ffmpeg-cvslog mailing list