From 068412f2e88b9fde731894bca685c25b985ec8e1 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Sat, 8 Sep 2018 17:27:40 +0200 Subject: avcodec/rscc: fix decoding of some iscc files --- libavcodec/rscc.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'libavcodec/rscc.c') diff --git a/libavcodec/rscc.c b/libavcodec/rscc.c index dae5e84634..7921f149ed 100644 --- a/libavcodec/rscc.c +++ b/libavcodec/rscc.c @@ -85,8 +85,18 @@ static av_cold int rscc_init(AVCodecContext *avctx) /* Get pixel format and the size of the pixel */ if (avctx->codec_tag == MKTAG('I', 'S', 'C', 'C')) { - avctx->pix_fmt = AV_PIX_FMT_BGRA; - ctx->component_size = 4; + if (avctx->extradata && avctx->extradata_size == 4) { + if ((avctx->extradata[0] >> 1) & 1) { + avctx->pix_fmt = AV_PIX_FMT_BGRA; + ctx->component_size = 4; + } else { + avctx->pix_fmt = AV_PIX_FMT_BGR24; + ctx->component_size = 3; + } + } else { + avctx->pix_fmt = AV_PIX_FMT_BGRA; + ctx->component_size = 4; + } } else if (avctx->codec_tag == MKTAG('R', 'S', 'C', 'C')) { ctx->component_size = avctx->bits_per_coded_sample / 8; switch (avctx->bits_per_coded_sample) { -- cgit v1.2.3