From: Carl Hetherington Date: Thu, 14 Dec 2017 19:39:07 +0000 (+0000) Subject: Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic X-Git-Tag: v2.11.30~10 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=f76de68a78b2924f61c299a039336bbd50f8adc9;hp=036c739fe6ea0b9873d4697b4ddec433644c1f51 Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic --- diff --git a/src/lib/util.cc b/src/lib/util.cc index 1f5b29101..637030e86 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -573,7 +573,7 @@ valid_image_file (boost::filesystem::path f) return ( ext == ".tif" || ext == ".tiff" || ext == ".jpg" || ext == ".jpeg" || ext == ".png" || ext == ".bmp" || ext == ".tga" || ext == ".dpx" || - ext == ".j2c" || ext == ".j2k" || ext == ".jp2" + ext == ".j2c" || ext == ".j2k" || ext == ".jp2" || ext == ".exr" ); }