Commit a4b5863e authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

Fix compilation of libavcodec/tiff.c

parent 379ad978
...@@ -627,7 +627,7 @@ static int init_image(TiffContext *s, AVFrame *frame) ...@@ -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; s->avctx->pix_fmt = s->le ? AV_PIX_FMT_GRAY16LE : AV_PIX_FMT_GRAY16BE;
break; break;
case 162: 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; break;
case 324: case 324:
s->avctx->pix_fmt = s->planar ? AV_PIX_FMT_GBRAP : AV_PIX_FMT_RGBA; s->avctx->pix_fmt = s->planar ? AV_PIX_FMT_GBRAP : AV_PIX_FMT_RGBA;
...@@ -1206,7 +1206,7 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -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(uint8_t*, p->data[0], p->data[2]);
FFSWAP(int, p->linesize[0], p->linesize[2]); FFSWAP(int, p->linesize[0], p->linesize[2]);
FFSWAP(uint8_t*, p->data[0], p->data[1]); FFSWAP(uint8_t*, p->data[0], p->data[1]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment