Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

diff --git a/run/tests b/run/tests
index 7a757e9d0e0fdd0bfdb6822d05c2264b398b3d4e..3f465a4334b6c27be2015c90d36e0243769457e6 100755 (executable)
--- a/run/tests
+++ b/run/tests
@@ -22,6 +22,6 @@ elif [ "$1" == "--quiet" ]; then
     build/test/unit-tests --catch_system_errors=no $*
 else
     ulimit -c unlimited
-    build/test/unit-tests --catch_system_errors=no $*
+    build/test/unit-tests --catch_system_errors=no --log_level=test_suite $*
 #    build/test/unit-tests --catch_system_errors=no $*
 fi

diff --git a/src/lib/image.cc b/src/lib/image.cc
index 959eec5a549732443df4f6037d3dc795ac008803..d3b193e7bc99a7d17c5c103489118809a3875d33 100644 (file)
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -469,7 +469,7 @@ Image::make_black ()
 void
 Image::make_transparent ()
 {
-       if (_pixel_format != AV_PIX_FMT_BGRA) {
+       if (_pixel_format != AV_PIX_FMT_BGRA && _pixel_format != AV_PIX_FMT_RGBA) {
                throw PixelFormatError ("make_transparent()", _pixel_format);
        }