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)
commit47080b6d17037fd64b3f3a7f19bbad3cdf2d3dac
tree179c04cd097a12790d4cd2c5afe3e65b12369f27
parent59412e3a0703222c8bc995a7deb883327b7a9c03
parentbcc5f69b33e27b5e11aaea8304ee02f8d895cdab
Merge commit 'bcc5f69b33e27b5e11aaea8304ee02f8d895cdab'

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

Conflicts:
libavcodec/tiff.c

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