Merge commit 'bcc5f69b'

* commit 'bcc5f69b':
  tiff: support reading gray+alpha at 16 bits

Conflicts:
	libavcodec/tiff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/tiff.c

@@ -613,6 +613,9 @@ static int init_image(TiffContext *s, ThreadFrame *frame)
     case 162:
         s->avctx->pix_fmt = AV_PIX_FMT_GRAY8A;
         break;
+    case 322:
+        s->avctx->pix_fmt = s->le ? AV_PIX_FMT_YA16LE : AV_PIX_FMT_YA16BE;
+        break;
     case 324:
         s->avctx->pix_fmt = AV_PIX_FMT_RGBA;
         break;