aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/tiff.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2013-06-02 16:50:39 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-06-02 16:50:39 +0200
commita4b5863eeac0a74e9bbd77b88d02b3e26bbc1869 (patch)
tree6cdb5d775812fafb6feff4a313b6fc01411571f0 /libavcodec/tiff.c
parent379ad9788b80e05c0379adc49b26704dfd27d564 (diff)
downloadffmpeg-a4b5863eeac0a74e9bbd77b88d02b3e26bbc1869.tar.gz
Fix compilation of libavcodec/tiff.c
Diffstat (limited to 'libavcodec/tiff.c')
-rw-r--r--libavcodec/tiff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 0ad12a12a7..15c384a439 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]);