[SCM] libav/experimental: tiff: support reading gray+alpha at 16 bits

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit bcc5f69b33e27b5e11aaea8304ee02f8d895cdab
Author: Vittorio Giovara <vittorio.giovara at gmail.com>
Date:   Sun Jul 20 22:54:35 2014 +0100

    tiff: support reading gray+alpha at 16 bits

diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 6afc2cb..7341b3f 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -262,6 +262,9 @@ static int init_image(TiffContext *s, AVFrame *frame)
     case 161:
         s->avctx->pix_fmt = s->le ? AV_PIX_FMT_GRAY16LE : AV_PIX_FMT_GRAY16BE;
         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;

-- 
Libav/FFmpeg packaging