git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/core/producer/color/color_producer.cpp b/core/producer/color/color_producer.cpp
index 7c14aaf281f6e2fe66f1ebbc6bcaa955c664c0d4..a6793b2dec052cb64e382853ed381ecc2d198f75 100644 (file)
--- a/core/producer/color/color_producer.cpp
+++ b/core/producer/color/color_producer.cpp
@@ -56,8 +56,11 @@ std::wstring get_hex_color(const std::wstring& str)
        if(str.at(0) == '#')\r
                return str.length() == 7 ? L"#FF" + str.substr(1) : str;\r
        \r
+       if(boost::iequals(str, L"EMPTY"))\r
+               return L"#00000000";\r
+\r
        if(boost::iequals(str, L"BLACK"))\r
-               return L"#000000FF";\r
+               return L"#FF000000";\r
        \r
        if(boost::iequals(str, L"WHITE"))\r
                return L"#FFFFFFFF";\r

diff --git a/core/producer/stage.cpp b/core/producer/stage.cpp
index fdaa5a0a392ccdfc9b4186518e7d21f8211106d0..8262b6ebeaa767e7823f587f64c478035bf0699c 100644 (file)
--- a/core/producer/stage.cpp
+++ b/core/producer/stage.cpp
@@ -99,7 +99,6 @@ public:
                        });\r
 \r
                        return frames;\r
-\r
                }\r
                catch(...)\r
                {\r