Merge commit 'bcc5f69b33e27b5e11aaea8304ee02f8d895cdab'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 20:45:33 +0000 (22:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 20:45:33 +0000 (22:45 +0200)
* commit 'bcc5f69b33e27b5e11aaea8304ee02f8d895cdab':
  tiff: support reading gray+alpha at 16 bits

Conflicts:
libavcodec/tiff.c

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

@@@ -610,9 -262,9 +610,12 @@@ static int init_image(TiffContext *s, T
      case 161:
          s->avctx->pix_fmt = s->le ? AV_PIX_FMT_GRAY16LE : AV_PIX_FMT_GRAY16BE;
          break;
 +    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;