From: ronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Mon, 15 Aug 2011 12:10:34 +0000 (+0000)
Subject: git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches... 
X-Git-Tag: 2.0.1~155
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ccaa3af7e1b264956b40c4dd908442d755aa2b81;p=casparcg

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1185 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d
---

diff --git a/core/producer/color/color_producer.cpp b/core/producer/color/color_producer.cpp
index 7c14aaf28..a6793b2de 100644
--- 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) == '#')
 		return str.length() == 7 ? L"#FF" + str.substr(1) : str;
 	
+	if(boost::iequals(str, L"EMPTY"))
+		return L"#00000000";
+
 	if(boost::iequals(str, L"BLACK"))
-		return L"#000000FF";
+		return L"#FF000000";
 	
 	if(boost::iequals(str, L"WHITE"))
 		return L"#FFFFFFFF";
diff --git a/core/producer/stage.cpp b/core/producer/stage.cpp
index fdaa5a0a3..8262b6ebe 100644
--- a/core/producer/stage.cpp
+++ b/core/producer/stage.cpp
@@ -99,7 +99,6 @@ public:
 			});
 
 			return frames;
-
 		}
 		catch(...)
 		{