Commit cbe3f1b1 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

lavc/jpeg2000dec: Allow to force a compatible pix_fmt.

This copies the behaviour of the libopenjpeg decoder.
Fixes ticket #5919.
parent d5bf704f
......@@ -402,6 +402,10 @@ static int get_siz(Jpeg2000DecoderContext *s)
break;
}
}
if ( s->avctx->pix_fmt != AV_PIX_FMT_NONE
&& !pix_fmt_match(s->avctx->pix_fmt, ncomponents, s->precision, log2_chroma_wh, s->pal8))
s->avctx->pix_fmt = AV_PIX_FMT_NONE;
if (s->avctx->pix_fmt == AV_PIX_FMT_NONE)
for (i = 0; i < possible_fmts_nb; ++i) {
if (pix_fmt_match(possible_fmts[i], ncomponents, s->precision, log2_chroma_wh, s->pal8)) {
s->avctx->pix_fmt = possible_fmts[i];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment