Merge commit 'f86f39cb'

* commit 'f86f39cb':
  tiff: support decoding GBRP and GBRAP formats

Conflicts:
	libavcodec/tiff.c

See: 379ad978Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/tiff.c

@@ -1321,7 +1321,7 @@ static int decode_frame(AVCodecContext *avctx,
         if (s->photometric == TIFF_PHOTOMETRIC_WHITE_IS_ZERO) {
             dst = p->data[plane];
             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 += stride;
             }