Unified · Split
| @@ -273,6 +273,9 @@ static int init_image(TiffContext *s, AVFrame *frame) · 272 unmodified lines | ||
| 273 | 273 | case 483: |
| 274 | 274 | s->avctx->pix_fmt = s->le ? AV_PIX_FMT_RGB48LE : AV_PIX_FMT_RGB48BE; |
| 275 | 275 | break; |
| 276 | + case 644: | |
| 277 | + s->avctx->pix_fmt = s->le ? AV_PIX_FMT_RGBA64LE : AV_PIX_FMT_RGBA64BE; | |
| 278 | + break; | |
| 276 | 279 | default: |
| 277 | 280 | av_log(s->avctx, AV_LOG_ERROR, |
| 278 | 281 | "This format is not supported (bpp=%d, bppcount=%d)\n", |
| @@ -636,13 +639,15 @@ static int decode_frame(AVCodecContext *avctx, · 357 unmodified lines | ||
| 636 | 639 | dst = p->data[0]; |
| 637 | 640 | soff = s->bpp >> 3; |
| 638 | 641 | ssize = s->width * soff; |
| 639 | − if (s->avctx->pix_fmt == AV_PIX_FMT_RGB48LE) { | |
| 642 | + if (s->avctx->pix_fmt == AV_PIX_FMT_RGB48LE || | |
| 643 | + s->avctx->pix_fmt == AV_PIX_FMT_RGBA64LE) { | |
| 640 | 644 | for (i = 0; i < s->height; i++) { |
| 641 | 645 | for (j = soff; j < ssize; j += 2) |
| 642 | 646 | AV_WL16(dst + j, AV_RL16(dst + j) + AV_RL16(dst + j - soff)); |
| 643 | 647 | dst += stride; |
| 644 | 648 | } |
| 645 | − } else if (s->avctx->pix_fmt == AV_PIX_FMT_RGB48BE) { | |
| 649 | + } else if (s->avctx->pix_fmt == AV_PIX_FMT_RGB48BE || | |
| 650 | + s->avctx->pix_fmt == AV_PIX_FMT_RGBA64BE) { | |
| 646 | 651 | for (i = 0; i < s->height; i++) { |
| 647 | 652 | for (j = soff; j < ssize; j += 2) |
| 648 | 653 | AV_WB16(dst + j, AV_RB16(dst + j) + AV_RB16(dst + j - soff)); |
| @@ -246,6 +246,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, · 245 unmodified lines | ||
| 246 | 246 | s->subsampling[1] = 1; |
| 247 | 247 | |
| 248 | 248 | switch (avctx->pix_fmt) { |
| 249 | + case AV_PIX_FMT_RGBA64LE: | |
| 249 | 250 | case AV_PIX_FMT_RGB48LE: |
| 250 | 251 | case AV_PIX_FMT_GRAY16LE: |
| 251 | 252 | case AV_PIX_FMT_RGBA: |
| @@ -535,7 +536,7 @@ AVCodec ff_tiff_encoder = { · 283 unmodified lines | ||
| 535 | 536 | .encode2 = encode_frame, |
| 536 | 537 | .pix_fmts = (const enum AVPixelFormat[]) { |
| 537 | 538 | AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB48LE, AV_PIX_FMT_PAL8, |
| 538 | − AV_PIX_FMT_RGBA, | |
| 539 | + AV_PIX_FMT_RGBA, AV_PIX_FMT_RGBA64LE, | |
| 539 | 540 | AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16LE, |
| 540 | 541 | AV_PIX_FMT_MONOBLACK, AV_PIX_FMT_MONOWHITE, |
| 541 | 542 | AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, |
| @@ -30,7 +30,7 @@ · 29 unmodified lines | ||
| 30 | 30 | |
| 31 | 31 | #define LIBAVCODEC_VERSION_MAJOR 56 |
| 32 | 32 | #define LIBAVCODEC_VERSION_MINOR 6 |
| 33 | −#define LIBAVCODEC_VERSION_MICRO 0 | |
| 33 | +#define LIBAVCODEC_VERSION_MICRO 1 | |
| 34 | 34 | |
| 35 | 35 | #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |
| 36 | 36 | LIBAVCODEC_VERSION_MINOR, \ |