Merge commit '3a3790b8f8b56ee6abc93ccac280eb693675e294'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 02:13:31 +0000 (03:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 02:19:23 +0000 (03:19 +0100)
commit9aabe6678147d947ce7a32bf9bb1e087fac7fdde
tree519b7d12aebdc9027f8ee4b412203abfdb97907e
parentc8e05c438f78ac5fee40f260a7f822f5a81b44e0
parent3a3790b8f8b56ee6abc93ccac280eb693675e294
Merge commit '3a3790b8f8b56ee6abc93ccac280eb693675e294'

* commit '3a3790b8f8b56ee6abc93ccac280eb693675e294':
  tiff: support encoding and decoding 64bit images

Conflicts:
libavcodec/tiff.c
libavcodec/tiffenc.c
libavcodec/version.h

See: c714cd3bd4af70e0cba1db399ca420b1f51a773d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/tiffenc.c
libavcodec/version.h