History

Fix compilation of libavcodec/tiff.c

Carl Eugen Hoyos committed 13 years ago

Commit a4b58631 parent 379ad971 file · +2 −2Browse files

Unified · Split

libavcodec/tiff.c+2−2
@@ -627,7 +627,7 @@ static int init_image(TiffContext *s, AVFrame *frame) · 626 unmodified lines
627 s->avctx->pix_fmt = s->le ? AV_PIX_FMT_GRAY16LE : AV_PIX_FMT_GRAY16BE;627 s->avctx->pix_fmt = s->le ? AV_PIX_FMT_GRAY16LE : AV_PIX_FMT_GRAY16BE;
628 break;628 break;
629 case 162:629 case 162:
630 s->avctx->pix_fmt = s>planar ? AV_PIX_FMT_NONE : AV_PIX_FMT_GRAY8A;630 s->avctx->pix_fmt = s->planar ? AV_PIX_FMT_NONE : AV_PIX_FMT_GRAY8A;
631 break;631 break;
632 case 324:632 case 324:
633 s->avctx->pix_fmt = s->planar ? AV_PIX_FMT_GBRAP : AV_PIX_FMT_RGBA;633 s->avctx->pix_fmt = s->planar ? AV_PIX_FMT_GBRAP : AV_PIX_FMT_RGBA;
@@ -1206,7 +1206,7 @@ static int decode_frame(AVCodecContext *avctx, · 572 unmodified lines
1206 }1206 }
1207 }1207 }
1208 1208
1209 if (s->planar && s->bpp_count > 2) {1209 if (s->planar && s->bppcount > 2) {
1210 FFSWAP(uint8_t*, p->data[0], p->data[2]);1210 FFSWAP(uint8_t*, p->data[0], p->data[2]);
1211 FFSWAP(int, p->linesize[0], p->linesize[2]);1211 FFSWAP(int, p->linesize[0], p->linesize[2]);
1212 FFSWAP(uint8_t*, p->data[0], p->data[1]);1212 FFSWAP(uint8_t*, p->data[0], p->data[1]);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t