diff options
author | Michael Niedermayer <[email protected]> | 2014-08-04 22:45:33 +0200 |
---|---|---|
committer | Michael Niedermayer <[email protected]> | 2014-08-04 22:45:33 +0200 |
commit | 47080b6d17037fd64b3f3a7f19bbad3cdf2d3dac (patch) | |
tree | 179c04cd097a12790d4cd2c5afe3e65b12369f27 /doc/examples | |
parent | 59412e3a0703222c8bc995a7deb883327b7a9c03 (diff) | |
parent | bcc5f69b33e27b5e11aaea8304ee02f8d895cdab (diff) |
Merge commit 'bcc5f69b33e27b5e11aaea8304ee02f8d895cdab'
* commit 'bcc5f69b33e27b5e11aaea8304ee02f8d895cdab':
tiff: support reading gray+alpha at 16 bits
Conflicts:
libavcodec/tiff.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'doc/examples')
0 files changed, 0 insertions, 0 deletions