From f8dea10d3f09376894613d0266c34d1a16ac735f Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Sat, 14 Jan 2012 01:14:51 +0100
Subject: [PATCH] sgi: decode images with 4 channels at 8 and 16 bits
---
Changelog | 1 +
libavcodec/sgidec.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Changelog b/Changelog
index e6a943152d8..c29d2271219 100644
--- a/Changelog
+++ b/Changelog
@@ -11,6 +11,7 @@ version <next>:
- XBM decoder
- bmp standalone parser
- OpenEXR image decoder
+- support decoding 4-channel SGI images
version 10:
diff --git a/libavcodec/sgidec.c b/libavcodec/sgidec.c
index 04cfcd0353c..357d54e7433 100644
--- a/libavcodec/sgidec.c
+++ b/libavcodec/sgidec.c
@@ -198,8 +198,8 @@ static int decode_frame(AVCodecContext *avctx,
avctx->pix_fmt = s->bytes_per_channel == 2 ? AV_PIX_FMT_GRAY16BE : AV_PIX_FMT_GRAY8;
} else if (s->depth == SGI_RGB) {
avctx->pix_fmt = s->bytes_per_channel == 2 ? AV_PIX_FMT_RGB48BE : AV_PIX_FMT_RGB24;
- } else if (s->depth == SGI_RGBA && s->bytes_per_channel == 1) {
- avctx->pix_fmt = AV_PIX_FMT_RGBA;
+ } else if (s->depth == SGI_RGBA) {
+ avctx->pix_fmt = s->bytes_per_channel == 2 ? AV_PIX_FMT_RGBA64BE : AV_PIX_FMT_RGBA;
} else {
av_log(avctx, AV_LOG_ERROR, "wrong picture format\n");
return -1;
--
GitLab