generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'f86f39cb9b1fcd063d5e4812132a75c06cc7acd2'

Browse Source 
* commit 'f86f39cb9b1fcd063d5e4812132a75c06cc7acd2':
  tiff: support decoding GBRP and GBRAP formats

Conflicts:
	libavcodec/tiff.c

See: 379ad9788b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-01-15 06:00:25 +01:00
parent 27513846f6 f86f39cb9b
commit 3779973a9b
1 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/tiff.c
View File

@@ -1321,7 +1321,7 @@ static int decode_frame(AVCodecContext *avctx,
if (s->photometric == TIFF_PHOTOMETRIC_WHITE_IS_ZERO) { if (s->photometric == TIFF_PHOTOMETRIC_WHITE_IS_ZERO) {
dst = p->data[plane]; dst = p->data[plane];
for (i = 0; i < s->height; i++) { for (i = 0; i < s->height; i++) {
for (j = 0; j < p->linesize[plane]; j++) for (j = 0; j < stride; j++)
dst[j] = (s->avctx->pix_fmt == AV_PIX_FMT_PAL8 ? (1<<s->bpp) - 1 : 255) - dst[j]; dst[j] = (s->avctx->pix_fmt == AV_PIX_FMT_PAL8 ? (1<<s->bpp) - 1 : 255) - dst[j];
dst += stride; dst += stride;
} }