提交 8a4284ad 编写于 作者: P Paul B Mahol

ff: fix case where image does not have alpha channel

Signed-off-by: NPaul B Mahol <onemda@gmail.com>
上级 6f5f7f70
......@@ -330,8 +330,16 @@ static av_cold int decode_init(AVCodecContext *avctx)
avctx->pix_fmt = (avctx->bits_per_coded_sample < 8) ||
(avctx->extradata_size >= 2 && palette_size) ? AV_PIX_FMT_PAL8 : AV_PIX_FMT_GRAY8;
} else if (avctx->bits_per_coded_sample <= 32) {
if (avctx->codec_tag != MKTAG('D','E','E','P'))
avctx->pix_fmt = AV_PIX_FMT_BGR32;
if (avctx->codec_tag != MKTAG('D','E','E','P')) {
if (avctx->bits_per_coded_sample == 24) {
avctx->pix_fmt = AV_PIX_FMT_RGB0;
} else if (avctx->bits_per_coded_sample == 32) {
avctx->pix_fmt = AV_PIX_FMT_BGR32;
} else {
av_log_ask_for_sample(avctx, "unknown bits_per_coded_sample\n");
return AVERROR_PATCHWELCOME;
}
}
} else {
return AVERROR_INVALIDDATA;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册