diff options
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/jp2.c | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/util.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c index 3bf97cb851f..e361df1304a 100644 --- a/source/blender/imbuf/intern/jp2.c +++ b/source/blender/imbuf/intern/jp2.c @@ -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)); } /** diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index c5bae4ddbad..27b566e25a2 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -252,6 +252,8 @@ static int isffmpeg(const char *filename) if (BLI_path_extension_check_n(filename, ".swf", ".jpg", + ".jp2", + ".j2c", ".png", ".dds", ".tga", |