diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 03:13:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 03:19:23 +0100 |
| commit | 9aabe6678147d947ce7a32bf9bb1e087fac7fdde (patch) | |
| tree | 519b7d12aebdc9027f8ee4b412203abfdb97907e /libavcodec | |
| parent | c8e05c438f78ac5fee40f260a7f822f5a81b44e0 (diff) | |
| parent | 3a3790b8f8b56ee6abc93ccac280eb693675e294 (diff) | |
| download | ffmpeg-9aabe6678147d947ce7a32bf9bb1e087fac7fdde.tar.gz | |
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>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/tiffenc.c | 8 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c index 18b6b7daa4..59ca69c772 100644 --- a/libavcodec/tiffenc.c +++ b/libavcodec/tiffenc.c @@ -573,12 +573,12 @@ AVCodec ff_tiff_encoder = { .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_GRAY8A, AV_PIX_FMT_GRAY16LE, AV_PIX_FMT_MONOBLACK, AV_PIX_FMT_MONOWHITE, 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 --git a/libavcodec/version.h b/libavcodec/version.h index 6610e8ca13..75e3da49fd 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 56 #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, \ |