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>

diff --cc libavcodec/tiffenc.c
index 18b6b7d,169360f..59ca69c
--- 1/libavcodec/tiffenc.c
--- 2/libavcodec/tiffenc.c
+++ b/libavcodec/tiffenc.c
@@@ -570,15 -533,14 +570,15 @@@ AVCodec ff_tiff_encoder = 
      .priv_data_size = sizeof(TiffEncoderContext),
      .init           = encode_init,
      .close          = encode_close,
 +    .capabilities   = CODEC_CAP_FRAME_THREADS | CODEC_CAP_INTRA_ONLY,
      .encode2        = encode_frame,
      .pix_fmts       = (const enum AVPixelFormat[]) {
-         AV_PIX_FMT_RGB24, AV_PIX_FMT_PAL8, AV_PIX_FMT_GRAY8,
-         AV_PIX_FMT_GRAY8A, AV_PIX_FMT_GRAY16LE,
+         AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB48LE, AV_PIX_FMT_PAL8,
+         AV_PIX_FMT_RGBA, AV_PIX_FMT_RGBA64LE,
 -        AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16LE,
++        AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY8A, AV_PIX_FMT_GRAY16LE,
          AV_PIX_FMT_MONOBLACK, AV_PIX_FMT_MONOWHITE,
 -        AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P,
 +        AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV444P,
-         AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_RGB48LE,
-         AV_PIX_FMT_RGBA, AV_PIX_FMT_RGBA64LE,
+         AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P,
          AV_PIX_FMT_NONE
      },
      .priv_class     = &tiffenc_class,

diff --cc libavcodec/version.h
index 6610e8c,d9589c2..75e3da4
--- 1/libavcodec/version.h
--- 2/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -29,8 -29,8 +29,8 @@@
  #include "libavutil/version.h"
  
  #define LIBAVCODEC_VERSION_MAJOR 56
 -#define LIBAVCODEC_VERSION_MINOR  6
 -#define LIBAVCODEC_VERSION_MICRO  1
 +#define LIBAVCODEC_VERSION_MINOR  15
- #define LIBAVCODEC_VERSION_MICRO 100
++#define LIBAVCODEC_VERSION_MICRO 101
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \