MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavc/jpeg2000dec: Allow to force a compatible pix_fmt.

Browse Source 
This copies the behaviour of the libopenjpeg decoder.
Fixes ticket #5919.
This commit is contained in:
Carl Eugen Hoyos 2020-04-13 16:25:02 +02:00
parent d5bf704f50
commit cbe3f1b1fb
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/jpeg2000dec.c
View File

@ -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];