Fix T70276: View animation with jpeg 2000 image will crash player

Since our ffmpeg is built with openjpeg support and thus can decode jpeg
2000 (in both J2K and JP2 codec flavors as well as high bitdepths), added
these extensions to the supported list.

Also IMB_ispic > IMB_ispic_type > imb_is_a_jp2 was only testing for jp2,
now do both jp2/j2k.

Reviewers: brecht

Maniphest Tasks: T70276

Differential Revision: https://developer.blender.org/D5909
This commit is contained in:
Philipp Oeser 2019-09-27 11:09:38 +02:00
parent 4b206d9a51
commit c5db0272d4
Notes: blender-bot 2023-02-14 00:40:35 +01:00
Referenced by issue #70276, View animation with jpeg 2000 image files leads to segfault
2 changed files with 3 additions and 1 deletions

View File

@ -83,7 +83,7 @@ static OPJ_CODEC_FORMAT format_from_header(const unsigned char mem[JP2_FILEHEADE
int imb_is_a_jp2(const unsigned char *buf)
{
return check_jp2(buf);
return (check_jp2(buf) || check_j2k(buf));
}
/**

View File

@ -252,6 +252,8 @@ static int isffmpeg(const char *filename)
if (BLI_path_extension_check_n(filename,
".swf",
".jpg",
".jp2",
".j2c",
".png",
".dds",
".tga",