Changed copyright header in all files, and added it in some files where it was missing.

#132

diff --git a/common/compiler/vs/disable_silly_warnings.h b/common/compiler/vs/disable_silly_warnings.h
index 416ba63cdf3a4d81dc57dfc6bc8be1f15c23a8bf..612bbeac7804571a8cd85e0562a307a98d07c7ca 100644 (file)
--- a/common/compiler/vs/disable_silly_warnings.h
+++ b/common/compiler/vs/disable_silly_warnings.h
@@ -1,5 +1,5 @@
 /*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 *  This file is part of CasparCG.\r
 *\r

diff --git a/common/concurrency/com_context.h b/common/concurrency/com_context.h
index 509c0afdbc7e2f0976807e78b537e31490844ee9..65c1446944850acb3c8422ede9210c060e3955fe 100644 (file)
--- a/common/concurrency/com_context.h
+++ b/common/concurrency/com_context.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/concurrency/executor.h b/common/concurrency/executor.h
index 79adf0a4deacad89876752ce3290e88c6e25dcd3..9eedf53c9fec0fe9750c1ccfbc7ad3ad1ee953b3 100644 (file)
--- a/common/concurrency/executor.h
+++ b/common/concurrency/executor.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+* Copyright 2013 Sveriges Television AB http://casparcg.com/
 *
 * This file is part of CasparCG (www.casparcg.com).
 *

diff --git a/common/concurrency/future_util.h b/common/concurrency/future_util.h
index 952e96ff9a43f0271fa118fce37519d71ddefb20..3b0dc7cff9a8e7061572647b237b4e573fd937ca 100644 (file)
--- a/common/concurrency/future_util.h
+++ b/common/concurrency/future_util.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+* Copyright 2013 Sveriges Television AB http://casparcg.com/
 *
 * This file is part of CasparCG (www.casparcg.com).
 *

diff --git a/common/concurrency/lock.h b/common/concurrency/lock.h
index 73316b2d205b234bc36598221876bbaa42ee2ff4..f8db29409e29c4a6ad428b487ceae4b1816b1daf 100644 (file)
--- a/common/concurrency/lock.h
+++ b/common/concurrency/lock.h
@@ -1,3 +1,23 @@
+/*\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
+*\r
+* This file is part of CasparCG (www.casparcg.com).\r
+*\r
+* CasparCG is free software: you can redistribute it and/or modify\r
+* it under the terms of the GNU General Public License as published by\r
+* the Free Software Foundation, either version 3 of the License, or\r
+* (at your option) any later version.\r
+*\r
+* CasparCG is distributed in the hope that it will be useful,\r
+* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+* GNU General Public License for more details.\r
+*\r
+* You should have received a copy of the GNU General Public License\r
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.\r
+*\r
+* Author: Robert Nagy, ronag89@gmail.com\r
+*/\r
 #pragma once\r
 \r
 namespace caspar {\r

diff --git a/common/concurrency/target.h b/common/concurrency/target.h
index 8f5cadccab0a458da82bc3defe9184dc9b80cc01..7504d6ad320f198c371cfa36d1992fedf750fe78 100644 (file)
--- a/common/concurrency/target.h
+++ b/common/concurrency/target.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/diagnostics/graph.cpp b/common/diagnostics/graph.cpp
index 1df5577024751d99b58340e65cb55dc275f80dac..542008e3bc33fe3420a29428f4a958ae43dc30ed 100644 (file)
--- a/common/diagnostics/graph.cpp
+++ b/common/diagnostics/graph.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/diagnostics/graph.h b/common/diagnostics/graph.h
index c64b2718e53758b85e1ded2397a2355ad8191521..06a5b912d400134617c2d17c760d761ba6bff630 100644 (file)
--- a/common/diagnostics/graph.h
+++ b/common/diagnostics/graph.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/env.cpp b/common/env.cpp
index 1d0361ad5096f939b5e5a7a29b04f1feaad71ae0..d2e941bbcfafd39f39f6ea4e80b3d26000039be3 100644 (file)
--- a/common/env.cpp
+++ b/common/env.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/env.h b/common/env.h
index de0c280e40f8f265e6baed8edf1f40462c95ce7b..b2c471d1b59e8ed1329f227094115cae314aadcd 100644 (file)
--- a/common/env.h
+++ b/common/env.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/exception/exceptions.h b/common/exception/exceptions.h
index 4288e1cdd491fade734eac00ff363678de75f626..9e6da193cec39c9e2941222bf8ca45b38c2ceaa9 100644 (file)
--- a/common/exception/exceptions.h
+++ b/common/exception/exceptions.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r
@@ -39,7 +39,7 @@ typedef boost::error_info<struct errinfo_nested_exception_, std::exception_ptr>
 struct caspar_exception                        : virtual boost::exception, virtual std::exception \r
 {\r
        caspar_exception(){}\r
-       virtual ~caspar_exception() throw() {}
+       virtual ~caspar_exception() throw() {}\r
        explicit caspar_exception(const char* msg) : std::exception(msg) {}\r
 };\r
 \r

diff --git a/common/exception/win32_exception.cpp b/common/exception/win32_exception.cpp
index 43af7c033d1f92bd9e34f879d6c10fa88811a72d..e0338c59258bb0630e05db01d28a863958aeb2b2 100644 (file)
--- a/common/exception/win32_exception.cpp
+++ b/common/exception/win32_exception.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/exception/win32_exception.h b/common/exception/win32_exception.h
index 37b818b9ad525212fc29e25585096380b820fb7a..8cfe515bd84951856e7c2136d36769f1f6ad250f 100644 (file)
--- a/common/exception/win32_exception.h
+++ b/common/exception/win32_exception.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/filesystem/filesystem_monitor.h b/common/filesystem/filesystem_monitor.h
index ad0834fc1219e51b004586c0267c4438d16c0f81..92ad3c6d612ddd944407b21c34b034955ad072ab 100644 (file)
--- a/common/filesystem/filesystem_monitor.h
+++ b/common/filesystem/filesystem_monitor.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/filesystem/polling_filesystem_monitor.cpp b/common/filesystem/polling_filesystem_monitor.cpp
index 20b78a8366a00a7a5f501001344c89f8f95a2cba..84103718d7ce11943c63bd7aa4dbd64977c8ea5d 100644 (file)
--- a/common/filesystem/polling_filesystem_monitor.cpp
+++ b/common/filesystem/polling_filesystem_monitor.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/filesystem/polling_filesystem_monitor.h b/common/filesystem/polling_filesystem_monitor.h
index d3b67018ec1edd2e8008cfc2286780515185d284..09b872418013d14ca112c13fb71dd87d95d616e1 100644 (file)
--- a/common/filesystem/polling_filesystem_monitor.h
+++ b/common/filesystem/polling_filesystem_monitor.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/log/log.cpp b/common/log/log.cpp
index 5051d097f7a7b0a06445b9dfdd3ae9fae912c31c..cccd426afecfc3ffeb63bad8cd0eb6a9589ea059 100644 (file)
--- a/common/log/log.cpp
+++ b/common/log/log.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/log/log.h b/common/log/log.h
index 39b615dd64c7d0cbfac45f95cd7b22653ee3d571..2d346593d2fc95848b443e5c9673da4c72f0615d 100644 (file)
--- a/common/log/log.h
+++ b/common/log/log.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/memory/endian.h b/common/memory/endian.h
index 6552a137cdabaa154ab79e6ff10c06883cdd89b9..6d17d691802e709ab041f04e216b832a3da1847b 100644 (file)
--- a/common/memory/endian.h
+++ b/common/memory/endian.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+* Copyright 2013 Sveriges Television AB http://casparcg.com/
 *
 * This file is part of CasparCG (www.casparcg.com).
 *

diff --git a/common/memory/memclr.h b/common/memory/memclr.h
index f80e167299a8474fe90d7524cf9b225a189ffb28..b99ac72110f578311e07bf3912bd9753255e0225 100644 (file)
--- a/common/memory/memclr.h
+++ b/common/memory/memclr.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/memory/memcpy.h b/common/memory/memcpy.h
index 4885138e52b11f620a9a74a643b3c0607aed894c..1fec4245863d478ab7344b8bc5d62660e4417f6b 100644 (file)
--- a/common/memory/memcpy.h
+++ b/common/memory/memcpy.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/memory/memshfl.h b/common/memory/memshfl.h
index c776e3b952d7cc78c05a6aef6e2160877d4559da..7b2e3b3b31f1959ef7fe9f1668747e2ea268adfa 100644 (file)
--- a/common/memory/memshfl.h
+++ b/common/memory/memshfl.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/memory/page_locked_allocator.h b/common/memory/page_locked_allocator.h
index 38863e4ea1e1d172f6892473be2fb51f7165b24f..44697f3a9ebed5638304d1dffa8c7e6ba2fd485a 100644 (file)
--- a/common/memory/page_locked_allocator.h
+++ b/common/memory/page_locked_allocator.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/memory/safe_ptr.h b/common/memory/safe_ptr.h
index 257302c309429b0f5539d632b9af7852bd6feae2..9fefe14baaf4691f80b6816c44425798c9772e28 100644 (file)
--- a/common/memory/safe_ptr.h
+++ b/common/memory/safe_ptr.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/os/windows/current_version.h b/common/os/windows/current_version.h
index 174bffa0aaa9fbb9dc4dd3d814d6991301e9b1c6..ec565adaefe6dbcaf123137ca08315e4ae773506 100644 (file)
--- a/common/os/windows/current_version.h
+++ b/common/os/windows/current_version.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/os/windows/system_info.h b/common/os/windows/system_info.h
index a6d58eb4577b9dabcec5494208d466cbb8a3cf4a..f494391975aa59aeabd225d243de3d2a7867fbe8 100644 (file)
--- a/common/os/windows/system_info.h
+++ b/common/os/windows/system_info.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/stdafx.cpp b/common/stdafx.cpp
index 923b06b9a95b823b42ad4e98f18fb7de1a037830..f96bfca7867e85729beb2aa82245c9c59e8b2664 100644 (file)
--- a/common/stdafx.cpp
+++ b/common/stdafx.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/stdafx.h b/common/stdafx.h
index 3d4ef7d61710c1664a80e87278dcb8228f52bb28..7760ab1a2145b9220e525e1986f1d59f01ccde94 100644 (file)
--- a/common/stdafx.h
+++ b/common/stdafx.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/utility/assert.h b/common/utility/assert.h
index 18be7cbad9e1cd6825f26611d701253a36dc5498..9bd0bcfd19955ffb39d7a69f81840036275d2d37 100644 (file)
--- a/common/utility/assert.h
+++ b/common/utility/assert.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/utility/base64.cpp b/common/utility/base64.cpp
index f0e806e03fee0019bedf02f988b7ccca5bc576b3..5b548aa16ae7c892ebdd3b4209e31cc772271907 100644 (file)
--- a/common/utility/base64.cpp
+++ b/common/utility/base64.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+* Copyright 2013 Sveriges Television AB http://casparcg.com/
 *
 * This file is part of CasparCG (www.casparcg.com).
 *

diff --git a/common/utility/base64.h b/common/utility/base64.h
index 6a90a7dc55af09bc4823eb80ea05815175eb33e5..a883ae539c0dc7812c8dfd629300e37850ee9ea1 100644 (file)
--- a/common/utility/base64.h
+++ b/common/utility/base64.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+* Copyright 2013 Sveriges Television AB http://casparcg.com/
 *
 * This file is part of CasparCG (www.casparcg.com).
 *

diff --git a/common/utility/iterator.h b/common/utility/iterator.h
index 5ee45847ff5e124eb9726e6d5e3d8d1c9a2b62c0..4e5113b659410144917db0d6ad920af0cabcbe39 100644 (file)
--- a/common/utility/iterator.h
+++ b/common/utility/iterator.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+* Copyright 2013 Sveriges Television AB http://casparcg.com/
 *
 * This file is part of CasparCG (www.casparcg.com).
 *

diff --git a/common/utility/move_on_copy.h b/common/utility/move_on_copy.h
index 0c272e5d08e791c91849207d9ef4359a3bc29014..c199aebe7af28b9fcc59fd899e957e12b62996c6 100644 (file)
--- a/common/utility/move_on_copy.h
+++ b/common/utility/move_on_copy.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/utility/param.h b/common/utility/param.h
index 94ec4923ccaea9f8dfaf68bbcc0758f4b5a327b4..0963e659f7d5a1357874c3b2e7789ca6685c6db0 100644 (file)
--- a/common/utility/param.h
+++ b/common/utility/param.h
@@ -1,3 +1,23 @@
+/*\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
+*\r
+* This file is part of CasparCG (www.casparcg.com).\r
+*\r
+* CasparCG is free software: you can redistribute it and/or modify\r
+* it under the terms of the GNU General Public License as published by\r
+* the Free Software Foundation, either version 3 of the License, or\r
+* (at your option) any later version.\r
+*\r
+* CasparCG is distributed in the hope that it will be useful,\r
+* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+* GNU General Public License for more details.\r
+*\r
+* You should have received a copy of the GNU General Public License\r
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.\r
+*\r
+* Author: Robert Nagy, ronag89@gmail.com\r
+*/\r
 #pragma once\r
 \r
 #include <boost/lexical_cast.hpp>\r

diff --git a/common/utility/string.cpp b/common/utility/string.cpp
index 33ba98500234e2be1d094351efef553973b4504e..7509f98660ca9424da30a44351efd1dd0cc900d7 100644 (file)
--- a/common/utility/string.cpp
+++ b/common/utility/string.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/utility/string.h b/common/utility/string.h
index a7aee7a8195d7f90f31a067defe26b91deedb16c..4b132820fd0b3875987c1aba9678d185e795e039 100644 (file)
--- a/common/utility/string.h
+++ b/common/utility/string.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/utility/timer.h b/common/utility/timer.h
index 79a31627cb3557fcbd227de69da359edbd5570d4..a39159a779af7ee40e81c5141261d28faa970ed8 100644 (file)
--- a/common/utility/timer.h
+++ b/common/utility/timer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/utility/tweener.cpp b/common/utility/tweener.cpp
index 0cff3c10d9ac77aa1e6fd9932aa7fbf1ee21ac9e..d399a93cdd647cdfa3ea21c9b83ea72af8050e69 100644 (file)
--- a/common/utility/tweener.cpp
+++ b/common/utility/tweener.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/common/utility/tweener.h b/common/utility/tweener.h
index 51ec8368942dc38b225a4147f419edec6834616f..179cef8eb576e9e8c199b75c9878589c2ef260bf 100644 (file)
--- a/common/utility/tweener.h
+++ b/common/utility/tweener.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/StdAfx.cpp b/core/StdAfx.cpp
index f2b946afaae3a37fd2191bec9f0ffa048cfadf85..ddb65ceb2e8445176b43336a38017a090dbcb496 100644 (file)
--- a/core/StdAfx.cpp
+++ b/core/StdAfx.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/StdAfx.h b/core/StdAfx.h
index 30a9629d62483a8a511294e19246c57ab2c5815e..c2d4f808774ebec2a13a6160f04ab6df504a484b 100644 (file)
--- a/core/StdAfx.h
+++ b/core/StdAfx.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/consumer/frame_consumer.cpp b/core/consumer/frame_consumer.cpp
index 251b3dcb2f8da1484ad25e661ce3c707856be5ce..e3f57f47fedcc00c0d7669e720a17cbc09d94c30 100644 (file)
--- a/core/consumer/frame_consumer.cpp
+++ b/core/consumer/frame_consumer.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/consumer/frame_consumer.h b/core/consumer/frame_consumer.h
index 3577a8e5ea53bd579d144dce96da77445476f270..c4085cf51b66ca20e67b493e8564416f4d378a7b 100644 (file)
--- a/core/consumer/frame_consumer.h
+++ b/core/consumer/frame_consumer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/consumer/output.cpp b/core/consumer/output.cpp
index aadfaa3afdd8a08080025e42ef609a159d6c60d0..665c5d10bdcdab7cf211bba7916c09a31ced1dd1 100644 (file)
--- a/core/consumer/output.cpp
+++ b/core/consumer/output.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/consumer/output.h b/core/consumer/output.h
index 1336a6694a5605c69b652b1f683de1ab2b6cbc73..a301ff935fb1f2d9c9fea7f9c42622df28552768 100644 (file)
--- a/core/consumer/output.h
+++ b/core/consumer/output.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/mixer/audio/audio_mixer.cpp b/core/mixer/audio/audio_mixer.cpp
index 7a932f3072b674f74c4521574fd3541ca139baff..ab5d8830ae23500140be82ea8e29011a12282e6b 100644 (file)
--- a/core/mixer/audio/audio_mixer.cpp
+++ b/core/mixer/audio/audio_mixer.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/mixer/audio/audio_mixer.h b/core/mixer/audio/audio_mixer.h
index a3196cf66fe527f4eda33e7f2eadb5df6c6bba17..68df6aa674ff2cfdbab8f546338935f9b07f84a2 100644 (file)
--- a/core/mixer/audio/audio_mixer.h
+++ b/core/mixer/audio/audio_mixer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/mixer/audio/audio_util.cpp b/core/mixer/audio/audio_util.cpp
index 59b80928f8cecca26f11f6db22f0e97e95c933d8..36d9d46295b570dfb965118fbaf88f327447661a 100644 (file)
--- a/core/mixer/audio/audio_util.cpp
+++ b/core/mixer/audio/audio_util.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+* Copyright 2013 Sveriges Television AB http://casparcg.com/
 *
 * This file is part of CasparCG (www.casparcg.com).
 *

diff --git a/core/mixer/audio/audio_util.h b/core/mixer/audio/audio_util.h
index bdfb7fca73b505c831fcde4b3ec2cf0af5b12c62..b17f1f07d907102fffe6b746095a27df146c3530 100644 (file)
--- a/core/mixer/audio/audio_util.h
+++ b/core/mixer/audio/audio_util.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/mixer/gpu/device_buffer.cpp b/core/mixer/gpu/device_buffer.cpp
index 161cac0e725f8d4275383784956dee742529e79a..ceb3508a4827cbc233d48b59cadecc5536b9e608 100644 (file)
--- a/core/mixer/gpu/device_buffer.cpp
+++ b/core/mixer/gpu/device_buffer.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/mixer/gpu/device_buffer.h b/core/mixer/gpu/device_buffer.h
index f924d8b1d38d2c44bb4ea832e656109bcb644e7f..d6fd962e8d80b45982b41d3610271a9116bf4392 100644 (file)
--- a/core/mixer/gpu/device_buffer.h
+++ b/core/mixer/gpu/device_buffer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/mixer/gpu/fence.cpp b/core/mixer/gpu/fence.cpp
index 286b90ad3d6ffb56520d75d078c04efc8e79e52e..6ffca70148f28927e013ec05ebf9f654004afea7 100644 (file)
--- a/core/mixer/gpu/fence.cpp
+++ b/core/mixer/gpu/fence.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/mixer/gpu/fence.h b/core/mixer/gpu/fence.h
index f5662314927db8514c3c0789c67bb391d89e6741..03bc3fbc96bafad46fd98946e3c52623f220214f 100644 (file)
--- a/core/mixer/gpu/fence.h
+++ b/core/mixer/gpu/fence.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/mixer/gpu/host_buffer.cpp b/core/mixer/gpu/host_buffer.cpp
index ee9362c3a23f1f442888b74b92c57e0359e59d18..92627402cfeff49d555eb9b3f79da09ff42f0f9b 100644 (file)
--- a/core/mixer/gpu/host_buffer.cpp
+++ b/core/mixer/gpu/host_buffer.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/mixer/gpu/host_buffer.h b/core/mixer/gpu/host_buffer.h
index 26937e7c1030b33c04468af954a29cf00183d0b0..d3759c3b83c3915f7837397dc85afdc6a174b1f4 100644 (file)
--- a/core/mixer/gpu/host_buffer.h
+++ b/core/mixer/gpu/host_buffer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/mixer/gpu/ogl_device.cpp b/core/mixer/gpu/ogl_device.cpp
index 0df165b92521c3758af8a146e9e1d5b18ec54e31..12f14b3d75f58ecf9bbbfa91366ef6f7d02650f8 100644 (file)
--- a/core/mixer/gpu/ogl_device.cpp
+++ b/core/mixer/gpu/ogl_device.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/mixer/gpu/ogl_device.h b/core/mixer/gpu/ogl_device.h
index d05c373a4fce6443a58d1498de045311ed4775e0..89a05a85966d6b2c1e1d0fe1373ae5d63fec8c66 100644 (file)
--- a/core/mixer/gpu/ogl_device.h
+++ b/core/mixer/gpu/ogl_device.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/mixer/gpu/shader.cpp b/core/mixer/gpu/shader.cpp
index b06c1580f6cda7c311fc04085257dc205db01291..9f00389ee7ad23219568603ae28fe245bcdff0d2 100644 (file)
--- a/core/mixer/gpu/shader.cpp
+++ b/core/mixer/gpu/shader.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r
@@ -25,7 +25,7 @@
 \r
 #include <common/gl/gl_check.h>\r
 \r
-#include <GL/glew.h>
+#include <GL/glew.h>\r
 \r
 #include <unordered_map>\r
 \r
@@ -128,30 +128,30 @@ public:
                GL(glUniform1f(get_location(name.c_str()), value));\r
        }\r
 \r
-    void set(const std::string& name, float value1, float value2)
-    {
-        GL(glUniform2f(get_location(name.c_str()), value1, value2));
-    }
-
-    void set(const std::string& name, float value1, float value2, float value3)
-    {
-        GL(glUniform3f(get_location(name.c_str()), value1, value2, value3));
-    }
-
-    void set(const std::string& name, float value1, float value2, float value3, float value4)
-    {
-        GL(glUniform4f(get_location(name.c_str()), value1, value2, value3, value4));
-    }
-
-    void set(const std::string& name, double value)
+    void set(const std::string& name, float value1, float value2)\r
+    {\r
+        GL(glUniform2f(get_location(name.c_str()), value1, value2));\r
+    }\r
+\r
+    void set(const std::string& name, float value1, float value2, float value3)\r
+    {\r
+        GL(glUniform3f(get_location(name.c_str()), value1, value2, value3));\r
+    }\r
+\r
+    void set(const std::string& name, float value1, float value2, float value3, float value4)\r
+    {\r
+        GL(glUniform4f(get_location(name.c_str()), value1, value2, value3, value4));\r
+    }\r
+\r
+    void set(const std::string& name, double value)\r
        {\r
                GL(glUniform1f(get_location(name.c_str()), static_cast<float>(value)));\r
        }\r
-
-    void set(const std::string& name, double value1, double value2)
-    {
-        GL(glUniform2f(get_location(name.c_str()), static_cast<float>(value1), static_cast<float>(value2)));
-    }
+\r
+    void set(const std::string& name, double value1, double value2)\r
+    {\r
+        GL(glUniform2f(get_location(name.c_str()), static_cast<float>(value1), static_cast<float>(value2)));\r
+    }\r
 };\r
 \r
 \r
@@ -159,11 +159,11 @@ shader::shader(const std::string& vertex_source_str, const std::string& fragment
 void shader::set(const std::string& name, bool value){impl_->set(name, value);}\r
 void shader::set(const std::string& name, int value){impl_->set(name, value);}\r
 void shader::set(const std::string& name, float value){impl_->set(name, value);}\r
-void shader::set(const std::string& name, float value1, float value2){impl_->set(name, value1, value2);}
-void shader::set(const std::string& name, float value1, float value2, float value3){impl_->set(name, value1, value2, value3);}
-void shader::set(const std::string& name, float value1, float value2, float value3, float value4){impl_->set(name, value1, value2, value3, value4);}
+void shader::set(const std::string& name, float value1, float value2){impl_->set(name, value1, value2);}\r
+void shader::set(const std::string& name, float value1, float value2, float value3){impl_->set(name, value1, value2, value3);}\r
+void shader::set(const std::string& name, float value1, float value2, float value3, float value4){impl_->set(name, value1, value2, value3, value4);}\r
 void shader::set(const std::string& name, double value){impl_->set(name, value);}\r
-void shader::set(const std::string& name, double value1, double value2){impl_->set(name, value1, value2);}
+void shader::set(const std::string& name, double value1, double value2){impl_->set(name, value1, value2);}\r
 int shader::id() const{return impl_->program_;}\r
 \r
-}}
+}}\r

diff --git a/core/mixer/gpu/shader.h b/core/mixer/gpu/shader.h
index 9f3e17502202566f182eb06bbef2812bb20473f6..42850944a00ceb1db5c9e7e362007b7361a7b5df 100644 (file)
--- a/core/mixer/gpu/shader.h
+++ b/core/mixer/gpu/shader.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r
@@ -36,11 +36,11 @@ public:
        void set(const std::string& name, bool value);\r
        void set(const std::string& name, int value);\r
        void set(const std::string& name, float value);\r
-    void set(const std::string& name, float value1, float value2);
-    void set(const std::string& name, float value1, float value2, float value3);
-    void set(const std::string& name, float value1, float value2, float value3, float value4);
-    void set(const std::string& name, double value);
-       void set(const std::string& name, double value1, double value2);
+    void set(const std::string& name, float value1, float value2);\r
+    void set(const std::string& name, float value1, float value2, float value3);\r
+    void set(const std::string& name, float value1, float value2, float value3, float value4);\r
+    void set(const std::string& name, double value);\r
+       void set(const std::string& name, double value1, double value2);\r
 private:\r
        friend class ogl_device;\r
        struct implementation;\r
@@ -49,4 +49,4 @@ private:
        int id() const;\r
 };\r
 \r
-}}
+}}\r

diff --git a/core/mixer/image/blend_modes.cpp b/core/mixer/image/blend_modes.cpp
index a832e522eacfe8003aa42039ca296bec27d86f45..3ed386fd2b8cca7ef876b2a5fed8a89bd86ecbc1 100644 (file)
--- a/core/mixer/image/blend_modes.cpp
+++ b/core/mixer/image/blend_modes.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r
@@ -27,7 +27,7 @@
 \r
 namespace caspar { namespace core {\r
                \r
-blend_mode::type get_blend_mode(const std::wstring& str)
+blend_mode::type get_blend_mode(const std::wstring& str)\r
 {\r
        if(boost::iequals(str, L"normal"))\r
                return blend_mode::normal;\r
@@ -91,24 +91,24 @@ blend_mode::type get_blend_mode(const std::wstring& str)
        return blend_mode::normal;\r
 }\r
 \r
-chroma::type get_chroma_mode(const std::wstring& str)
-{
-    if     (boost::iequals(str, L"none"))
-        return chroma::none;
-    else if(boost::iequals(str, L"red"))
-        return chroma::red;
-    else if(boost::iequals(str, L"yellow"))
-        return chroma::yellow;
-    else if(boost::iequals(str, L"green"))
-        return chroma::green;
-    else if(boost::iequals(str, L"torquise"))
-        return chroma::torquise;
-    else if(boost::iequals(str, L"blue"))
-        return chroma::blue;
-    else if(boost::iequals(str, L"magenta"))
-        return chroma::magenta;
-
-    return chroma::none;
-}
-
-}}
+chroma::type get_chroma_mode(const std::wstring& str)\r
+{\r
+    if     (boost::iequals(str, L"none"))\r
+        return chroma::none;\r
+    else if(boost::iequals(str, L"red"))\r
+        return chroma::red;\r
+    else if(boost::iequals(str, L"yellow"))\r
+        return chroma::yellow;\r
+    else if(boost::iequals(str, L"green"))\r
+        return chroma::green;\r
+    else if(boost::iequals(str, L"torquise"))\r
+        return chroma::torquise;\r
+    else if(boost::iequals(str, L"blue"))\r
+        return chroma::blue;\r
+    else if(boost::iequals(str, L"magenta"))\r
+        return chroma::magenta;\r
+\r
+    return chroma::none;\r
+}\r
+\r
+}}\r

diff --git a/core/mixer/image/blend_modes.h b/core/mixer/image/blend_modes.h
index aed360a18f9cf12d666ab216e046235e54ab9e03..a0cbb8caf2083a593096d1601d82d88c4a02be41 100644 (file)
--- a/core/mixer/image/blend_modes.h
+++ b/core/mixer/image/blend_modes.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r
@@ -23,31 +23,31 @@
 \r
 namespace caspar { namespace core {\r
                \r
-struct chroma
-{
-    enum type
-    {
-        none     = 0x000000,
-        red      = 0xff0000,
-        yellow   = 0xffff00,
-        green    = 0x00ff00,
-        torquise = 0x00ffff,
-        blue     = 0x0000ff,
-        magenta  = 0xff00ff
-    };
-
-    unsigned int    key;
-    float           threshold,
-                    softness,
-                    spill,
-                    blur;
-    bool            show_mask;
-
-    chroma(type m=none)
-    : key(m), threshold(0.0), softness(0.0), spill(0.0),
-      blur(0.0), show_mask(false) {}
-};
-
+struct chroma\r
+{\r
+    enum type\r
+    {\r
+        none     = 0x000000,\r
+        red      = 0xff0000,\r
+        yellow   = 0xffff00,\r
+        green    = 0x00ff00,\r
+        torquise = 0x00ffff,\r
+        blue     = 0x0000ff,\r
+        magenta  = 0xff00ff\r
+    };\r
+\r
+    unsigned int    key;\r
+    float           threshold,\r
+                    softness,\r
+                    spill,\r
+                    blur;\r
+    bool            show_mask;\r
+\r
+    chroma(type m=none)\r
+    : key(m), threshold(0.0), softness(0.0), spill(0.0),\r
+      blur(0.0), show_mask(false) {}\r
+};\r
+\r
 struct blend_mode\r
 {\r
        enum type \r
@@ -85,14 +85,14 @@ struct blend_mode
                blend_mode_count \r
        };\r
 \r
-       type    mode;
-       chroma  chroma;
+       type    mode;\r
+       chroma  chroma;\r
+\r
+       blend_mode(type t = normal) : mode(t) {}\r
+};\r
+\r
+blend_mode::type get_blend_mode(const std::wstring& str);\r
+\r
+chroma::type get_chroma_mode(const std::wstring& str);\r
 \r
-       blend_mode(type t = normal) : mode(t) {}
-};
-
-blend_mode::type get_blend_mode(const std::wstring& str);
-
-chroma::type get_chroma_mode(const std::wstring& str);
-
-}}
+}}\r

diff --git a/core/mixer/image/image_kernel.cpp b/core/mixer/image/image_kernel.cpp
index d25cc88fc65693b82d864057488f5a921445880f..4529b8f7918ef2b9df0b2daf54e0e9e34a51d959 100644 (file)
--- a/core/mixer/image/image_kernel.cpp
+++ b/core/mixer/image/image_kernel.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r
@@ -106,27 +106,27 @@ struct image_kernel::implementation : boost::noncopyable
                shader_->set("local_key",               texture_id::local_key);\r
                shader_->set("layer_key",               texture_id::layer_key);\r
                shader_->set("is_hd",                   params.pix_desc.planes.at(0).height > 700 ? 1 : 0);\r
-               shader_->set("has_local_key",   bool(params.local_key));
-               shader_->set("has_layer_key",   bool(params.layer_key));
+               shader_->set("has_local_key",   bool(params.local_key));\r
+               shader_->set("has_layer_key",   bool(params.layer_key));\r
                shader_->set("pixel_format",    params.pix_desc.pix_fmt);       \r
                shader_->set("opacity",                 params.transform.is_key ? 1.0 : params.transform.opacity);      \r
-
-        shader_->set("chroma_mode",    params.blend_mode.chroma.key == chroma::green ? 1 : (params.blend_mode.chroma.key == chroma::blue ? 2 : 0));
-        shader_->set("chroma_blend",   params.blend_mode.chroma.threshold, params.blend_mode.chroma.softness);
-        shader_->set("chroma_spill",   params.blend_mode.chroma.spill);
-//        shader_->set("chroma.key",      ((params.blend_mode.chroma.key >> 24) && 0xff)/255.0f,
-//                                        ((params.blend_mode.chroma.key >> 16) && 0xff)/255.0f,
-//                                        (params.blend_mode.chroma.key & 0xff)/255.0f);
-//             if (params.blend_mode.chroma.key != chroma::none)
-//             {
-//                 shader_->set("chroma.threshold",    params.blend_mode.chroma.threshold);
-//                 shader_->set("chroma.softness",     params.blend_mode.chroma.softness);
-//            shader_->set("chroma.blur",         params.blend_mode.chroma.blur);
-//                 shader_->set("chroma.spill",        params.blend_mode.chroma.spill);
-//            shader_->set("chroma.show_mask",    params.blend_mode.chroma.show_mask);
-//             }
+\r
+        shader_->set("chroma_mode",    params.blend_mode.chroma.key == chroma::green ? 1 : (params.blend_mode.chroma.key == chroma::blue ? 2 : 0));\r
+        shader_->set("chroma_blend",   params.blend_mode.chroma.threshold, params.blend_mode.chroma.softness);\r
+        shader_->set("chroma_spill",   params.blend_mode.chroma.spill);\r
+//        shader_->set("chroma.key",      ((params.blend_mode.chroma.key >> 24) && 0xff)/255.0f,\r
+//                                        ((params.blend_mode.chroma.key >> 16) && 0xff)/255.0f,\r
+//                                        (params.blend_mode.chroma.key & 0xff)/255.0f);\r
+//             if (params.blend_mode.chroma.key != chroma::none)\r
+//             {\r
+//                 shader_->set("chroma.threshold",    params.blend_mode.chroma.threshold);\r
+//                 shader_->set("chroma.softness",     params.blend_mode.chroma.softness);\r
+//            shader_->set("chroma.blur",         params.blend_mode.chroma.blur);\r
+//                 shader_->set("chroma.spill",        params.blend_mode.chroma.spill);\r
+//            shader_->set("chroma.show_mask",    params.blend_mode.chroma.show_mask);\r
+//             }\r
                \r
-               // Setup blend_func             
+               // Setup blend_func             \r
                if(params.transform.is_key)\r
                        params.blend_mode = blend_mode::normal;\r
 \r
@@ -135,7 +135,7 @@ struct image_kernel::implementation : boost::noncopyable
                        params.background->bind(6);\r
 \r
                        shader_->set("background",      texture_id::background);\r
-                       shader_->set("blend_mode",      params.blend_mode.mode);
+                       shader_->set("blend_mode",      params.blend_mode.mode);\r
                        shader_->set("keyer",           params.keyer);\r
                }\r
                else\r
@@ -253,4 +253,4 @@ void image_kernel::draw(draw_params&& params)
        impl_->draw(std::move(params));\r
 }\r
 \r
-}}
+}}\r

diff --git a/core/mixer/image/image_kernel.h b/core/mixer/image/image_kernel.h
index 89a69c80e02bb4ab7431dbd99698c9fa4f8389ac..10a8622e9884336f3f025b80dcfede6963069f8c 100644 (file)
--- a/core/mixer/image/image_kernel.h
+++ b/core/mixer/image/image_kernel.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r
@@ -49,7 +49,7 @@ struct draw_params
        pixel_format_desc                                               pix_desc;\r
        std::vector<safe_ptr<device_buffer>>    textures;\r
        frame_transform                                                 transform;\r
-       blend_mode                                                              blend_mode;
+       blend_mode                                                              blend_mode;\r
        keyer::type                                                             keyer;\r
        std::shared_ptr<device_buffer>                  background;\r
        std::shared_ptr<device_buffer>                  local_key;\r

diff --git a/core/mixer/image/image_mixer.cpp b/core/mixer/image/image_mixer.cpp
index 2fe7e94ed8b28c996d1e799f7aecec73d93d6e4a..a51073e82ba6659c4ec813f47339677976b53018 100644 (file)
--- a/core/mixer/image/image_mixer.cpp
+++ b/core/mixer/image/image_mixer.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r
@@ -56,7 +56,7 @@ struct item
        frame_transform                                                 transform;\r
 };\r
 \r
-typedef std::pair<blend_mode, std::vector<item>> layer;
+typedef std::pair<blend_mode, std::vector<item>> layer;\r
 \r
 class image_renderer\r
 {\r
@@ -144,7 +144,7 @@ private:
                std::shared_ptr<device_buffer> local_key_buffer;\r
                std::shared_ptr<device_buffer> local_mix_buffer;\r
                                \r
-               if(layer.first.mode != blend_mode::normal || layer.first.chroma.key != chroma::none)
+               if(layer.first.mode != blend_mode::normal || layer.first.chroma.key != chroma::none)\r
                {\r
                        auto layer_draw_buffer = create_mixer_buffer(4, format_desc);\r
 \r
@@ -159,7 +159,7 @@ private:
                        BOOST_FOREACH(auto& item, layer.second)         \r
                                draw_item(std::move(item), draw_buffer, layer_key_buffer, local_key_buffer, local_mix_buffer, format_desc);             \r
                                        \r
-                       draw_mixer_buffer(draw_buffer, std::move(local_mix_buffer), layer.first);
+                       draw_mixer_buffer(draw_buffer, std::move(local_mix_buffer), layer.first);\r
                }                                       \r
 \r
                layer_key_buffer = std::move(local_key_buffer);\r
@@ -213,7 +213,7 @@ private:
 \r
        void draw_mixer_buffer(safe_ptr<device_buffer>&                 draw_buffer, \r
                                                   std::shared_ptr<device_buffer>&& source_buffer, \r
-                                                  blend_mode                                   blend_mode = blend_mode::normal)
+                                                  blend_mode                                   blend_mode = blend_mode::normal)\r
        {\r
                if(!source_buffer)\r
                        return;\r
@@ -251,7 +251,7 @@ public:
        {\r
        }\r
 \r
-       void begin_layer(blend_mode blend_mode)
+       void begin_layer(blend_mode blend_mode)\r
        {\r
                layers_.push_back(std::make_pair(blend_mode, std::vector<item>()));\r
        }\r
@@ -291,7 +291,7 @@ void image_mixer::begin(basic_frame& frame){impl_->begin(frame);}
 void image_mixer::visit(write_frame& frame){impl_->visit(frame);}\r
 void image_mixer::end(){impl_->end();}\r
 boost::unique_future<safe_ptr<host_buffer>> image_mixer::operator()(const video_format_desc& format_desc){return impl_->render(format_desc);}\r
-void image_mixer::begin_layer(blend_mode blend_mode){impl_->begin_layer(blend_mode);}
+void image_mixer::begin_layer(blend_mode blend_mode){impl_->begin_layer(blend_mode);}\r
 void image_mixer::end_layer(){impl_->end_layer();}\r
 \r
 }}
\ No newline at end of file

diff --git a/core/mixer/image/image_mixer.h b/core/mixer/image/image_mixer.h
index 783ef953be80fec7c27be0af0265b556db5ef422..d4db0c8919dcfe0aab03ad240e11e9290d6b98f6 100644 (file)
--- a/core/mixer/image/image_mixer.h
+++ b/core/mixer/image/image_mixer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r
@@ -48,7 +48,7 @@ public:
        virtual void visit(core::write_frame& frame);\r
        virtual void end();\r
 \r
-       void begin_layer(blend_mode blend_mode);
+       void begin_layer(blend_mode blend_mode);\r
        void end_layer();\r
                \r
        boost::unique_future<safe_ptr<host_buffer>> operator()(const video_format_desc& format_desc);\r

diff --git a/core/mixer/image/shader/blending_glsl.h b/core/mixer/image/shader/blending_glsl.h
index 132fb716f01e0de003ec2bc15ffdabd835329ed5..bba4e44a29e8450d24ab68ab51b4e840c1757cd8 100644 (file)
--- a/core/mixer/image/shader/blending_glsl.h
+++ b/core/mixer/image/shader/blending_glsl.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r
@@ -267,55 +267,55 @@ static std::string get_blend_glsl()
                ;\r
                                                                                                                                                                                                                                                                                                                                                                                                                                                   \r
                return glsl;\r
-}
-
-static std::string get_chroma_glsl()
-{
-    static std::string glsl =
-        "// Chroma keying                                                       \n"
-        "// Author: Tim Eves <timseves@googlemail.com>                          \n"
-        "//                                                                     \n"
-        "// This implements the Chroma key algorithm described in the paper:    \n"
-        "//      'Software Chroma Keying in an Imersive Virtual Environment'    \n"
-        "//      by F. van den Bergh & V. Lalioti                               \n"
-        "// but as a pixel shader algorithm.                                    \n"
-        "//                                                                     \n"
-        "                                                                       \n"
-        "float       chroma_blend_w = chroma_blend.y - chroma_blend.x;          \n"
-        "const vec4  grey_xfer  = vec4(0.3, 0.59, 0.11, 0.0);                   \n"
-        "                                                                       \n"
-        "float fma(float a, float b, float c) { return a*b + c; }               \n"
-        "                                                                       \n"
-        "// This allows us to implement the paper's alphaMap curve in software  \n"
-        "// rather than a largeish array                                        \n"
-        "float alpha_map(float d)                                               \n"
-        "{                                                                      \n"
-        "    return 1.0-smoothstep(chroma_blend.x, chroma_blend.y, d);          \n"
-        "}                                                                      \n"
-        "                                                                       \n"
-        "vec4 supress_spill(vec4 c, float d)                                    \n"
-        "{                                                                      \n"
-        "    float ds = smoothstep(chroma_spill, 1.0, d/chroma_blend.y);        \n"
-        "    float gl = dot(grey_xfer, c);                                      \n"
-        "    return mix(c, vec4(vec3(gl*gl), gl), ds);                          \n"
-        "}                                                                      \n"
-        "                                                                       \n"
-        "// Key on green                                                        \n"
-        "vec4 ChromaOnGreen(vec4 c)                                             \n"
-        "{                                                                      \n"
-        "    float d = fma(2.0, c.g, -c.r - c.b)/2.0;                           \n"
-        "    c *= alpha_map(d);                                                 \n"
-        "    return supress_spill(c, d);                                        \n"
-        "}                                                                      \n"
-        "                                                                       \n"
-        "//Key on blue                                                          \n"
-        "vec4 ChromaOnBlue(vec4 c)                                              \n"
-        "{                                                                      \n"
-        "    float d = fma(2.0, c.b, -c.r - c.g)/2.0;                           \n"
-        "    c *= alpha_map(d);                                                 \n"
-        "    return supress_spill(c, d);                                        \n"
-        "}                                                                      \n"
-       ;
-
-        return glsl;
-}
+}\r
+\r
+static std::string get_chroma_glsl()\r
+{\r
+    static std::string glsl =\r
+        "// Chroma keying                                                       \n"\r
+        "// Author: Tim Eves <timseves@googlemail.com>                          \n"\r
+        "//                                                                     \n"\r
+        "// This implements the Chroma key algorithm described in the paper:    \n"\r
+        "//      'Software Chroma Keying in an Imersive Virtual Environment'    \n"\r
+        "//      by F. van den Bergh & V. Lalioti                               \n"\r
+        "// but as a pixel shader algorithm.                                    \n"\r
+        "//                                                                     \n"\r
+        "                                                                       \n"\r
+        "float       chroma_blend_w = chroma_blend.y - chroma_blend.x;          \n"\r
+        "const vec4  grey_xfer  = vec4(0.3, 0.59, 0.11, 0.0);                   \n"\r
+        "                                                                       \n"\r
+        "float fma(float a, float b, float c) { return a*b + c; }               \n"\r
+        "                                                                       \n"\r
+        "// This allows us to implement the paper's alphaMap curve in software  \n"\r
+        "// rather than a largeish array                                        \n"\r
+        "float alpha_map(float d)                                               \n"\r
+        "{                                                                      \n"\r
+        "    return 1.0-smoothstep(chroma_blend.x, chroma_blend.y, d);          \n"\r
+        "}                                                                      \n"\r
+        "                                                                       \n"\r
+        "vec4 supress_spill(vec4 c, float d)                                    \n"\r
+        "{                                                                      \n"\r
+        "    float ds = smoothstep(chroma_spill, 1.0, d/chroma_blend.y);        \n"\r
+        "    float gl = dot(grey_xfer, c);                                      \n"\r
+        "    return mix(c, vec4(vec3(gl*gl), gl), ds);                          \n"\r
+        "}                                                                      \n"\r
+        "                                                                       \n"\r
+        "// Key on green                                                        \n"\r
+        "vec4 ChromaOnGreen(vec4 c)                                             \n"\r
+        "{                                                                      \n"\r
+        "    float d = fma(2.0, c.g, -c.r - c.b)/2.0;                           \n"\r
+        "    c *= alpha_map(d);                                                 \n"\r
+        "    return supress_spill(c, d);                                        \n"\r
+        "}                                                                      \n"\r
+        "                                                                       \n"\r
+        "//Key on blue                                                          \n"\r
+        "vec4 ChromaOnBlue(vec4 c)                                              \n"\r
+        "{                                                                      \n"\r
+        "    float d = fma(2.0, c.b, -c.r - c.g)/2.0;                           \n"\r
+        "    c *= alpha_map(d);                                                 \n"\r
+        "    return supress_spill(c, d);                                        \n"\r
+        "}                                                                      \n"\r
+       ;\r
+\r
+        return glsl;\r
+}\r

diff --git a/core/mixer/image/shader/image_shader.cpp b/core/mixer/image/shader/image_shader.cpp
index 1ef8026d1e03d4fe247008f7dd8d30a58b27a83f..2a32bd34fffd052187e74de8f8f4486af354ccee 100644 (file)
--- a/core/mixer/image/shader/image_shader.cpp
+++ b/core/mixer/image/shader/image_shader.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r
@@ -127,24 +127,24 @@ std::string get_vertex()
        "}                                                                                                                                                                      \n";\r
 }\r
 \r
-std::string get_chroma_func()
-{
-        return get_chroma_glsl()
-
-        +
-
-               "vec4 chroma_key(vec4 c)                                                \n"
-               "{                                                                      \n"
-               "   switch (chroma_mode)                                                \n"
-               "   {                                                                   \n"
-               "   case 0: return c;                                                   \n"
-               "   case 1: return ChromaOnGreen(c.bgra).bgra;                          \n"
-               "   case 2: return ChromaOnBlue(c.bgra).bgra;                           \n"
-               "   }                                                                   \n"
-               "   return c;                                                           \n"
-               "}                                                                      \n";
-}
-
+std::string get_chroma_func()\r
+{\r
+        return get_chroma_glsl()\r
+\r
+        +\r
+\r
+               "vec4 chroma_key(vec4 c)                                                \n"\r
+               "{                                                                      \n"\r
+               "   switch (chroma_mode)                                                \n"\r
+               "   {                                                                   \n"\r
+               "   case 0: return c;                                                   \n"\r
+               "   case 1: return ChromaOnGreen(c.bgra).bgra;                          \n"\r
+               "   case 2: return ChromaOnBlue(c.bgra).bgra;                           \n"\r
+               "   }                                                                   \n"\r
+               "   return c;                                                           \n"\r
+               "}                                                                      \n";\r
+}\r
+\r
 std::string get_fragment(bool blend_modes)\r
 {\r
        return\r
@@ -175,19 +175,19 @@ std::string get_fragment(bool blend_modes)
        "uniform float          sat;                                                                                                                    \n"\r
        "uniform float          con;                                                                                                                    \n"\r
        "                                                                                                                                                                       \n"     \r
-    "uniform int        chroma_mode;                                                    \n"
-    "uniform vec2       chroma_blend;                                                   \n"
-    "uniform float      chroma_spill;                                                   \n"
+    "uniform int        chroma_mode;                                                    \n"\r
+    "uniform vec2       chroma_blend;                                                   \n"\r
+    "uniform float      chroma_spill;                                                   \n"\r
 \r
        +\r
                \r
        (blend_modes ? get_blend_color_func() : get_simple_blend_color_func())\r
 \r
-
-    +
-
-    get_chroma_func()
-
+\r
+    +\r
+\r
+    get_chroma_func()\r
+\r
        +\r
        \r
        "                                                                                                                                                                       \n"\r
@@ -260,7 +260,7 @@ std::string get_fragment(bool blend_modes)
        "void main()                                                                                                                                            \n"\r
        "{                                                                                                                                                                      \n"\r
        "       vec4 color = get_rgba_color();                                                                                                  \n"\r
-       "   color = chroma_key(color);                                                      \n"
+       "   color = chroma_key(color);                                                      \n"\r
        "   if(levels)                                                                                                                                          \n"\r
        "               color.rgb = LevelsControl(color.rgb, min_input, max_input, gamma, min_output, max_output); \n"\r
        "       if(csb)                                                                                                                                                 \n"\r

diff --git a/core/mixer/image/shader/image_shader.h b/core/mixer/image/shader/image_shader.h
index 582bfb47bfe3824b0166a8eda218f548ece7aaaf..8ece6bdabfefd86017efb00274bf86b013c6b9e9 100644 (file)
--- a/core/mixer/image/shader/image_shader.h
+++ b/core/mixer/image/shader/image_shader.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r
@@ -23,8 +23,8 @@
 \r
 #include <common/memory/safe_ptr.h>\r
 \r
-#define SHADER_PROGRAM(prog)    #prog
-
+#define SHADER_PROGRAM(prog)    #prog\r
+\r
 namespace caspar { namespace core {\r
 \r
 class shader;\r

diff --git a/core/mixer/mixer.cpp b/core/mixer/mixer.cpp
index 20ff470d61d15518a7e84cc93c71abd79357bfab..c5f2e7c74035eed477acad732c90bf5d08782238 100644 (file)
--- a/core/mixer/mixer.cpp
+++ b/core/mixer/mixer.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/mixer/mixer.h b/core/mixer/mixer.h
index 3fd32a808728b8c578fb93b418e1f2b212cd3e8d..185ab38e443af3dbc3febcdb3b531eb3763f3258 100644 (file)
--- a/core/mixer/mixer.h
+++ b/core/mixer/mixer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r
@@ -67,8 +67,8 @@ public:
        core::video_format_desc get_video_format_desc() const; // nothrow\r
        void set_video_format_desc(const video_format_desc& format_desc);\r
        \r
-       void set_blend_mode(int index, blend_mode::type value);
-    void set_chroma(int index, const chroma & value);
+       void set_blend_mode(int index, blend_mode::type value);\r
+    void set_chroma(int index, const chroma & value);\r
        void clear_blend_mode(int index);\r
        void clear_blend_modes();\r
 \r

diff --git a/core/mixer/read_frame.cpp b/core/mixer/read_frame.cpp
index f73bf55687a6de1ce6b8a747d67bbd45152e7085..8c1e3c7639a25e23960cdb39ce1abc2d2e06bf13 100644 (file)
--- a/core/mixer/read_frame.cpp
+++ b/core/mixer/read_frame.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/mixer/read_frame.h b/core/mixer/read_frame.h
index 22759ecc6076da166b1670800d8368aa767d0241..8817436008a9e78ccf36c88b7e21b7a664ea43dc 100644 (file)
--- a/core/mixer/read_frame.h
+++ b/core/mixer/read_frame.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/mixer/write_frame.cpp b/core/mixer/write_frame.cpp
index 570990c9ea83e222c959a4545f65bd9d7c7a16e9..c46e78a7e7e4821dba19cad1b8be30eb67304a4c 100644 (file)
--- a/core/mixer/write_frame.cpp
+++ b/core/mixer/write_frame.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/mixer/write_frame.h b/core/mixer/write_frame.h
index 08fbb6cd3cf964a098aac7358f554404af1089ee..a2b1435ba97177fa2cb74a979bcade9f18d0a7a3 100644 (file)
--- a/core/mixer/write_frame.h
+++ b/core/mixer/write_frame.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/monitor/monitor.cpp b/core/monitor/monitor.cpp
index cab17c18be3b9f0c8e802d70e9d1a75df2e40663..d36148ce1aa9aeafab9375354370c4d8f04d0a62 100644 (file)
--- a/core/monitor/monitor.cpp
+++ b/core/monitor/monitor.cpp
@@ -1,3 +1,23 @@
+/*
+* Copyright 2013 Sveriges Television AB http://casparcg.com/
+*
+* This file is part of CasparCG (www.casparcg.com).
+*
+* CasparCG is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* CasparCG is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.
+*
+* Author: Robert Nagy, ronag89@gmail.com
+*/
 #include "../StdAfx.h"
 
 #include "monitor.h"

diff --git a/core/monitor/monitor.h b/core/monitor/monitor.h
index e19ae42fbc77f57d6dfc073222bc3342f9321db8..a8acb0cd909f8b425897102a1f0e39670841d76e 100644 (file)
--- a/core/monitor/monitor.h
+++ b/core/monitor/monitor.h
@@ -1,3 +1,23 @@
+/*
+* Copyright 2013 Sveriges Television AB http://casparcg.com/
+*
+* This file is part of CasparCG (www.casparcg.com).
+*
+* CasparCG is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* CasparCG is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.
+*
+* Author: Robert Nagy, ronag89@gmail.com
+*/
 #pragma once
 
 #include <common/memory/safe_ptr.h>

diff --git a/core/producer/channel/channel_producer.cpp b/core/producer/channel/channel_producer.cpp
index 2c52d88bfe414a05fd15c154c4d9904c977e3bf5..d0cf09c372a711633be35d26add557f0ce8b62f8 100644 (file)
--- a/core/producer/channel/channel_producer.cpp
+++ b/core/producer/channel/channel_producer.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/producer/channel/channel_producer.h b/core/producer/channel/channel_producer.h
index 6d39ce6a61f44c400f7bcee56296a8a6e9589611..9cd0c422d7585a4c3fd78f5e87ab81a09ba189a9 100644 (file)
--- a/core/producer/channel/channel_producer.h
+++ b/core/producer/channel/channel_producer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/producer/color/color_producer.cpp b/core/producer/color/color_producer.cpp
index fd2bf78b2ab9848482c65e7fea7312b0faede650..92605edcfa532b7778ead98a9fb8f2c7e02c7587 100644 (file)
--- a/core/producer/color/color_producer.cpp
+++ b/core/producer/color/color_producer.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/producer/color/color_producer.h b/core/producer/color/color_producer.h
index e7b1cfdb459ba4227bb447901d2917d6ac722e3d..48c662b1675981d91c828cd6f1035b32bc543125 100644 (file)
--- a/core/producer/color/color_producer.h
+++ b/core/producer/color/color_producer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/producer/frame/basic_frame.cpp b/core/producer/frame/basic_frame.cpp
index ce4f773a1aad73c56870aafcfb278c9376146c9d..0190de945199d1ea580f318b6d107e971b844b68 100644 (file)
--- a/core/producer/frame/basic_frame.cpp
+++ b/core/producer/frame/basic_frame.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/producer/frame/basic_frame.h b/core/producer/frame/basic_frame.h
index 3b7a44d493a1740c88636a838b2808089710cd08..e57d7aa265976ba16c8ac6fa85df4d40e9a5e965 100644 (file)
--- a/core/producer/frame/basic_frame.h
+++ b/core/producer/frame/basic_frame.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/producer/frame/frame_factory.h b/core/producer/frame/frame_factory.h
index 89285b671ceefd47b3c57003adcb22e51df21f04..5e2d5eb2521fa796e5a405cef81d2982393539a1 100644 (file)
--- a/core/producer/frame/frame_factory.h
+++ b/core/producer/frame/frame_factory.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/producer/frame/frame_transform.cpp b/core/producer/frame/frame_transform.cpp
index 3a8470c470c3a787be164310507567870acf023d..d540977e6c884e8a3bfa485f284cafc313ba55cc 100644 (file)
--- a/core/producer/frame/frame_transform.cpp
+++ b/core/producer/frame/frame_transform.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r
@@ -66,7 +66,7 @@ frame_transform& frame_transform::operator*=(const frame_transform &other)
        field_mode                               = static_cast<field_mode::type>(field_mode & other.field_mode);\r
        is_key                                  |= other.is_key;\r
        is_mix                                  |= other.is_mix;\r
-
+\r
        return *this;\r
 }\r
 \r

diff --git a/core/producer/frame/frame_transform.h b/core/producer/frame/frame_transform.h
index 363df57172c6699502e39919ee80dac67cbccf26..a60e15eed3cfdb24ca4905332af7b207c2b19fb8 100644 (file)
--- a/core/producer/frame/frame_transform.h
+++ b/core/producer/frame/frame_transform.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r
@@ -79,4 +79,4 @@ bool operator<(const frame_transform& lhs, const frame_transform& rhs);
 bool operator==(const frame_transform& lhs, const frame_transform& rhs);\r
 bool operator!=(const frame_transform& lhs, const frame_transform& rhs);\r
 \r
-}}
+}}\r

diff --git a/core/producer/frame/frame_visitor.h b/core/producer/frame/frame_visitor.h
index 66d0b20e3e3f89e67b3577601e15f1dcfeae149b..c8ca21ca406d7866b21c38fdf5539f64815667c7 100644 (file)
--- a/core/producer/frame/frame_visitor.h
+++ b/core/producer/frame/frame_visitor.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/producer/frame/pixel_format.h b/core/producer/frame/pixel_format.h
index 5e62ff1d2c420de7ee0bd0cee302ab38887f7062..87d5b76be1f85a773ad4365c233cddf5d93bfbd2 100644 (file)
--- a/core/producer/frame/pixel_format.h
+++ b/core/producer/frame/pixel_format.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/producer/frame_producer.cpp b/core/producer/frame_producer.cpp
index 76aa3d7590ccea36cde58b405f47bbcc16f73259..d37a3ac3aae5008d7bf9c31e5071ff01d859aa92 100644 (file)
--- a/core/producer/frame_producer.cpp
+++ b/core/producer/frame_producer.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/producer/frame_producer.h b/core/producer/frame_producer.h
index 083823b15b3f012791da2245bf947c60b69d0f9b..313bd9850a129f7e040bede8955287883c71dca8 100644 (file)
--- a/core/producer/frame_producer.h
+++ b/core/producer/frame_producer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/producer/layer.cpp b/core/producer/layer.cpp
index 94d74d334b98da88b438e6b63dafdc3b13babdbc..484349403603e2d2995183e8ffcb265cc374f2bb 100644 (file)
--- a/core/producer/layer.cpp
+++ b/core/producer/layer.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/producer/layer.h b/core/producer/layer.h
index 46e873364e0a6c9dbb25d100f25d3533fa219e3b..9c57a932773a39bf076c028478cc7ab21c432ab8 100644 (file)
--- a/core/producer/layer.h
+++ b/core/producer/layer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/producer/separated/separated_producer.cpp b/core/producer/separated/separated_producer.cpp
index 6f3ada8f313c5beb843915bec6b3d91fe7410bdd..1018b822c80ac96d34fa00e2e06ac0d76878eb72 100644 (file)
--- a/core/producer/separated/separated_producer.cpp
+++ b/core/producer/separated/separated_producer.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/producer/separated/separated_producer.h b/core/producer/separated/separated_producer.h
index 3937243479cc9bb8acbcc055a3cd46d1d0c9a0d6..2244533856baa27efe923ce2de40719da81f8c19 100644 (file)
--- a/core/producer/separated/separated_producer.h
+++ b/core/producer/separated/separated_producer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/producer/stage.cpp b/core/producer/stage.cpp
index 59fafd065d9ffb70ce8b52f32c504f9a2b6f6aee..7cb9ef9b2d8292c2453067e01eaca8f7b8a99939 100644 (file)
--- a/core/producer/stage.cpp
+++ b/core/producer/stage.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/producer/stage.h b/core/producer/stage.h
index 403498d9011fe461979382bf5533fd5a3f405c3a..eb55da3acf2c17c87a100e5e3edffecc9dcb0a19 100644 (file)
--- a/core/producer/stage.h
+++ b/core/producer/stage.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/producer/transition/transition_producer.cpp b/core/producer/transition/transition_producer.cpp
index 1375ed0e6efdba513c0cf617ba4ed5083188de8a..a8b92effd2e79016e9369eb3ca5ace842fb83e8d 100644 (file)
--- a/core/producer/transition/transition_producer.cpp
+++ b/core/producer/transition/transition_producer.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/producer/transition/transition_producer.h b/core/producer/transition/transition_producer.h
index b185d109efc17efd9d45c8e2f07f9555ea6a56e1..2e9fd1f076ed92334f17ec1ce36b261a376e4c72 100644 (file)
--- a/core/producer/transition/transition_producer.h
+++ b/core/producer/transition/transition_producer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/thumbnail_generator.cpp b/core/thumbnail_generator.cpp
index a4099cecff317adaa463f25cf01bc2a6bae57603..9e8ce0edd2970da021c316e62307d55672cfa2b9 100644 (file)
--- a/core/thumbnail_generator.cpp
+++ b/core/thumbnail_generator.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/thumbnail_generator.h b/core/thumbnail_generator.h
index 2b9ec0395f16979e648a324aa58381cbe0506a30..80d954e2d724bedf833325c9af22d966d827ac86 100644 (file)
--- a/core/thumbnail_generator.h
+++ b/core/thumbnail_generator.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/video_channel.cpp b/core/video_channel.cpp
index 059e8d631e96044e195328ef03e59c565fa8ac47..101d93714f1783c3301803f0942df4e922d52792 100644 (file)
--- a/core/video_channel.cpp
+++ b/core/video_channel.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/video_channel.h b/core/video_channel.h
index ee470eedd660f7bc1fda41dd83f55d89fcedce23..63d748bafd8a95869033e5839e412db269c82992 100644 (file)
--- a/core/video_channel.h
+++ b/core/video_channel.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/video_format.cpp b/core/video_format.cpp
index a5bc10f52614200c50f7ba3910cd14553ddec913..7db4520743f088fb6693aae6b5b58c011a84f037 100644 (file)
--- a/core/video_format.cpp
+++ b/core/video_format.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/core/video_format.h b/core/video_format.h
index 4b50e075db88c77681a2e4f7530530478a0ce55a..1b4ed3a69b8d393a96dcafa1322187ee66e76626 100644 (file)
--- a/core/video_format.h
+++ b/core/video_format.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/bluefish/StdAfx.cpp b/modules/bluefish/StdAfx.cpp
index da91e016118ef6f52e1f362bf8271cd75cbaea9e..fae8796a86f38614795138932eda50d4fa3389c6 100644 (file)
--- a/modules/bluefish/StdAfx.cpp
+++ b/modules/bluefish/StdAfx.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/bluefish/StdAfx.h b/modules/bluefish/StdAfx.h
index fdc866f4a51abac1b9b517153c69c8f605c07535..0eb0bb16e3f1827a785b636512416cf0e7004174 100644 (file)
--- a/modules/bluefish/StdAfx.h
+++ b/modules/bluefish/StdAfx.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/bluefish/bluefish.cpp b/modules/bluefish/bluefish.cpp
index 3c06a32bcc4f39c0e8524c0641c15bd50fd23da9..62cb6d8d7d140db90f472bbdf5038f80ce40da98 100644 (file)
--- a/modules/bluefish/bluefish.cpp
+++ b/modules/bluefish/bluefish.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/bluefish/bluefish.h b/modules/bluefish/bluefish.h
index 17188767253e4b9c0a4094df579bec15b61f1654..79ea2ef827b031def3d010e97e2c455175b5e975 100644 (file)
--- a/modules/bluefish/bluefish.h
+++ b/modules/bluefish/bluefish.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/bluefish/consumer/bluefish_consumer.cpp b/modules/bluefish/consumer/bluefish_consumer.cpp
index 4f1740e6d5e057b8348e6c93031f4179d8ae4783..7db7417fb7cecf7d3273a5470c84e187748dd3a7 100644 (file)
--- a/modules/bluefish/consumer/bluefish_consumer.cpp
+++ b/modules/bluefish/consumer/bluefish_consumer.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/bluefish/consumer/bluefish_consumer.h b/modules/bluefish/consumer/bluefish_consumer.h
index 2be5389752a45431bc41a8ea2166ce9d53c2974a..5ff534755c690927b2cdeac3d9c4b8ed4c7bc698 100644 (file)
--- a/modules/bluefish/consumer/bluefish_consumer.h
+++ b/modules/bluefish/consumer/bluefish_consumer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/bluefish/util/blue_velvet.cpp b/modules/bluefish/util/blue_velvet.cpp
index 0eefd390ab1d11b3fd2cc05be3ed5a9ae0b428e1..1e0304f87ddc32298a2058a414a641c2426df5e6 100644 (file)
--- a/modules/bluefish/util/blue_velvet.cpp
+++ b/modules/bluefish/util/blue_velvet.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/bluefish/util/blue_velvet.h b/modules/bluefish/util/blue_velvet.h
index 7895cd4802191506a47baed8eaec229e4c3ba55a..859598b12ef0a5b315cee970932db5032bd68893 100644 (file)
--- a/modules/bluefish/util/blue_velvet.h
+++ b/modules/bluefish/util/blue_velvet.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/bluefish/util/memory.h b/modules/bluefish/util/memory.h
index d9ffebac2d2b88b4c56d43a900620339374f8637..11644e91f850de5cf75a5fbd2a8c1e3904367b4f 100644 (file)
--- a/modules/bluefish/util/memory.h
+++ b/modules/bluefish/util/memory.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/decklink/StdAfx.cpp b/modules/decklink/StdAfx.cpp
index 61ffa6908b87254ce5fead0b23bb30d825b1dd24..584a326fe39291b9ce6a9360d82797cac4d88d44 100644 (file)
--- a/modules/decklink/StdAfx.cpp
+++ b/modules/decklink/StdAfx.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/decklink/StdAfx.h b/modules/decklink/StdAfx.h
index ee2bab48895799e324ed9a283256b247a563d235..9bbf01a3f45e79e9d6a525cec993c12fcd7ef7f5 100644 (file)
--- a/modules/decklink/StdAfx.h
+++ b/modules/decklink/StdAfx.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/decklink/consumer/decklink_consumer.cpp b/modules/decklink/consumer/decklink_consumer.cpp
index c00ebe6f67977fc96627715edf269e33f06728fc..373013ae946b0d6cf4c20406bf9cd05a004d3e38 100644 (file)
--- a/modules/decklink/consumer/decklink_consumer.cpp
+++ b/modules/decklink/consumer/decklink_consumer.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/decklink/consumer/decklink_consumer.h b/modules/decklink/consumer/decklink_consumer.h
index 02d9b180d7677bf415cbab94cd06164ba3e74b57..c81a8f7a27908a79c23de668867b934489a3318b 100644 (file)
--- a/modules/decklink/consumer/decklink_consumer.h
+++ b/modules/decklink/consumer/decklink_consumer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/decklink/decklink.cpp b/modules/decklink/decklink.cpp
index b8c834e29660dacb2588fc3e003e9fe70fcc81ad..5cc69fb9f1980ac5919cbf24e71c4a00117ec7a5 100644 (file)
--- a/modules/decklink/decklink.cpp
+++ b/modules/decklink/decklink.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/decklink/decklink.h b/modules/decklink/decklink.h
index 0dff05db8983ada3ddff46c997472a5392b701d2..e40b9c027f49e5ebbbf59ee5aeecd274a2a07d01 100644 (file)
--- a/modules/decklink/decklink.h
+++ b/modules/decklink/decklink.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/decklink/producer/decklink_producer.cpp b/modules/decklink/producer/decklink_producer.cpp
index 164185ac2838c01988a3f91fff818b64553eec69..7851ecc51c1bfc24b922bc1b6fb75f973271728c 100644 (file)
--- a/modules/decklink/producer/decklink_producer.cpp
+++ b/modules/decklink/producer/decklink_producer.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/decklink/producer/decklink_producer.h b/modules/decklink/producer/decklink_producer.h
index bd9cae92cc535f43caf43bfbe7463e4c48728f6b..b31ceaf70ff5461cf5f36156bfebc112395bf666 100644 (file)
--- a/modules/decklink/producer/decklink_producer.h
+++ b/modules/decklink/producer/decklink_producer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/decklink/util/util.h b/modules/decklink/util/util.h
index 4138f58b8e0010c1a3f4a91c147ff48299e963dc..4c6ab50514734323fcd0342d462e4d4b33eb901b 100644 (file)
--- a/modules/decklink/util/util.h
+++ b/modules/decklink/util/util.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/StdAfx.cpp b/modules/ffmpeg/StdAfx.cpp
index 923b06b9a95b823b42ad4e98f18fb7de1a037830..f96bfca7867e85729beb2aa82245c9c59e8b2664 100644 (file)
--- a/modules/ffmpeg/StdAfx.cpp
+++ b/modules/ffmpeg/StdAfx.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/StdAfx.h b/modules/ffmpeg/StdAfx.h
index f7e56ad990a43d50d21b4d23b502bd363f4eafc6..2f97c1dfc39a58e397ce52309f962ec8c31f3099 100644 (file)
--- a/modules/ffmpeg/StdAfx.h
+++ b/modules/ffmpeg/StdAfx.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
index ab72ad8802e43ef80a5e262bf0be94d5828ed48c..786d3a8f938ff327bace8ece8c8d8c9d6dfd9d35 100644 (file)
--- a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
+++ b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/consumer/ffmpeg_consumer.h b/modules/ffmpeg/consumer/ffmpeg_consumer.h
index 9f27cdd36bbc5e0840e21f5820db0a718764e993..0b7204d6844adf0273310120d4d780415a318121 100644 (file)
--- a/modules/ffmpeg/consumer/ffmpeg_consumer.h
+++ b/modules/ffmpeg/consumer/ffmpeg_consumer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/ffmpeg.cpp b/modules/ffmpeg/ffmpeg.cpp
index 3bf0f8fd8eb17b71df693f0cb202d42e81ba0a24..0fca351b4571b05430a313a9fd24db66908c757e 100644 (file)
--- a/modules/ffmpeg/ffmpeg.cpp
+++ b/modules/ffmpeg/ffmpeg.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/ffmpeg.h b/modules/ffmpeg/ffmpeg.h
index 604802fd34284800b849afe76f23db880f68d2f2..130683f3ee306683fe3935e2244de0670c7ed308 100644 (file)
--- a/modules/ffmpeg/ffmpeg.h
+++ b/modules/ffmpeg/ffmpeg.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/ffmpeg_error.h b/modules/ffmpeg/ffmpeg_error.h
index 3d7fa6727607859218c881b8b81fb0718f5804b9..5b915d1035dbc231e4e5dd576828181bcf3689b9 100644 (file)
--- a/modules/ffmpeg/ffmpeg_error.h
+++ b/modules/ffmpeg/ffmpeg_error.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/producer/audio/audio_decoder.cpp b/modules/ffmpeg/producer/audio/audio_decoder.cpp
index c2a7e2a08f72dcd8d4269db82684a479b3f71c0b..c17c00dbf04c8300c406415b4c3b6dacbd8021dc 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_decoder.cpp
+++ b/modules/ffmpeg/producer/audio/audio_decoder.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/producer/audio/audio_decoder.h b/modules/ffmpeg/producer/audio/audio_decoder.h
index 7f5c07d5586369f53e055ef687920ac80ba43532..99003c455296978ab55567c21a221ceb4b3fbadf 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_decoder.h
+++ b/modules/ffmpeg/producer/audio/audio_decoder.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/producer/audio/audio_resampler.cpp b/modules/ffmpeg/producer/audio/audio_resampler.cpp
index 7d6afb796736d6ea69ce65a017fc1cd31f5cbf09..18e6639fc751e49f81a1b7a86ca6f4301c406180 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_resampler.cpp
+++ b/modules/ffmpeg/producer/audio/audio_resampler.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/producer/audio/audio_resampler.h b/modules/ffmpeg/producer/audio/audio_resampler.h
index cb50ebd65f3be76c2bb2ef3007406b6c38f20f7d..ebc734e8aeb068cece21ccfe7b8d203cdc53e0e3 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_resampler.h
+++ b/modules/ffmpeg/producer/audio/audio_resampler.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/producer/ffmpeg_params.h b/modules/ffmpeg/producer/ffmpeg_params.h
index fdeace204924aaab47c579884e613394165b84ef..f7c148cd535b4fe044be8b9e0ac2005b9ada8b34 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_params.h
+++ b/modules/ffmpeg/producer/ffmpeg_params.h
@@ -1,3 +1,23 @@
+/*
+* Copyright 2013 Sveriges Television AB http://casparcg.com/
+*
+* This file is part of CasparCG (www.casparcg.com).
+*
+* CasparCG is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* CasparCG is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.
+*
+* Author: Julian Waller
+*/
 #pragma once
 
 #include <string>

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index 03b89ecb5f88e1120aec1b514c0b683fc9fc8ec7..eaf12d0fe9b95fbf73eb0d397e16de0ad9ce3bed 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.h b/modules/ffmpeg/producer/ffmpeg_producer.h
index c27e60f1c42e4203c24bf75daff4d995cfb7e1fd..8a88c741d55c5a6fffd0d60037e1c3ae221aa552 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.h
+++ b/modules/ffmpeg/producer/ffmpeg_producer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/producer/filter/filter.cpp b/modules/ffmpeg/producer/filter/filter.cpp
index 9c2ef158a3cd37aff26d90d319dedac7a9cfd180..d1f942601e68aa2f4bee7e60aa4ae9ffe41e8457 100644 (file)
--- a/modules/ffmpeg/producer/filter/filter.cpp
+++ b/modules/ffmpeg/producer/filter/filter.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/producer/filter/filter.h b/modules/ffmpeg/producer/filter/filter.h
index f1989201b729803c4dac927065b4c16572076046..d1bdc57b866e40d6322637ba58f54e687245931d 100644 (file)
--- a/modules/ffmpeg/producer/filter/filter.h
+++ b/modules/ffmpeg/producer/filter/filter.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/producer/filter/parallel_yadif.cpp b/modules/ffmpeg/producer/filter/parallel_yadif.cpp
index b6388424aa1b2ee0f835a59f9c0486a3dd3d3807..915f82b9743880a773b4224847d9d3ef53202793 100644 (file)
--- a/modules/ffmpeg/producer/filter/parallel_yadif.cpp
+++ b/modules/ffmpeg/producer/filter/parallel_yadif.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/producer/filter/parallel_yadif.h b/modules/ffmpeg/producer/filter/parallel_yadif.h
index 6c2a3b89bc5dff71d9daf57128aa32b2bb69e144..8d0f605005e2ce6ea098a9c1b8bba77145c5611f 100644 (file)
--- a/modules/ffmpeg/producer/filter/parallel_yadif.h
+++ b/modules/ffmpeg/producer/filter/parallel_yadif.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/producer/input/input.cpp b/modules/ffmpeg/producer/input/input.cpp
index de3f2264f1908877047e75c1ccd3aca6a68b075d..b11e6565357e1a9a9ad18a54d8bc1304cc2b1a72 100644 (file)
--- a/modules/ffmpeg/producer/input/input.cpp
+++ b/modules/ffmpeg/producer/input/input.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/producer/input/input.h b/modules/ffmpeg/producer/input/input.h
index 7406430fcbeb7d3b833c76a8226e3872688afcf7..05431b6a3d12a0d827e9a09b2c43d695e381b1bd 100644 (file)
--- a/modules/ffmpeg/producer/input/input.h
+++ b/modules/ffmpeg/producer/input/input.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/producer/muxer/display_mode.h b/modules/ffmpeg/producer/muxer/display_mode.h
index 201074d81b325c0d645e20eea0aa93f8ebb96d6e..164580af247a3632dae847b061cd63d9d6777f5b 100644 (file)
--- a/modules/ffmpeg/producer/muxer/display_mode.h
+++ b/modules/ffmpeg/producer/muxer/display_mode.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/producer/muxer/frame_muxer.cpp b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
index b733e924a76cbb26dd886d84861a6cbffb8c7fca..4fd95c8953f421b911bf5a1a6371f81077bbbabb 100644 (file)
--- a/modules/ffmpeg/producer/muxer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/producer/muxer/frame_muxer.h b/modules/ffmpeg/producer/muxer/frame_muxer.h
index 28d9dd853f68b653ccce4a5c88e0fb01a70dc16b..9035c21af11366936a9376dae4535dfb447c3766 100644 (file)
--- a/modules/ffmpeg/producer/muxer/frame_muxer.h
+++ b/modules/ffmpeg/producer/muxer/frame_muxer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/producer/tbb_avcodec.cpp b/modules/ffmpeg/producer/tbb_avcodec.cpp
index 09ad9d573d7990936cbd57c05fba4f08571a1d17..26503140867fbfb76d38d29cb77e038a37437ff7 100644 (file)
--- a/modules/ffmpeg/producer/tbb_avcodec.cpp
+++ b/modules/ffmpeg/producer/tbb_avcodec.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/producer/tbb_avcodec.h b/modules/ffmpeg/producer/tbb_avcodec.h
index 2756cad8781cbfefe5f668caaafd9a1b1a5bc8b9..4816caa7e4014c270a2f5aa9e5695c5c62d08692 100644 (file)
--- a/modules/ffmpeg/producer/tbb_avcodec.h
+++ b/modules/ffmpeg/producer/tbb_avcodec.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/producer/util/flv.cpp b/modules/ffmpeg/producer/util/flv.cpp
index 4b9063173b7be86264b265b74709b0d934cbb99b..e4050b016b727dad22eccb67cb2e6ed3232b221a 100644 (file)
--- a/modules/ffmpeg/producer/util/flv.cpp
+++ b/modules/ffmpeg/producer/util/flv.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/producer/util/flv.h b/modules/ffmpeg/producer/util/flv.h
index 6de0ba3532e5acc03b2e4ee6d8180c52e65f7ae8..7aaaa3707f8f36343e154d4a73d022236170a1f7 100644 (file)
--- a/modules/ffmpeg/producer/util/flv.h
+++ b/modules/ffmpeg/producer/util/flv.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/producer/util/util.cpp b/modules/ffmpeg/producer/util/util.cpp
index ac6b677d3eb68b368fbd81d052c397a2042aaad2..6c74d22f4a73b2689118a886ec48105191183fcb 100644 (file)
--- a/modules/ffmpeg/producer/util/util.cpp
+++ b/modules/ffmpeg/producer/util/util.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/producer/util/util.h b/modules/ffmpeg/producer/util/util.h
index 7c58ac757653503986c6657ac27a4fc505465f29..4699e7101122ec937b03d3b20986ce9125262c65 100644 (file)
--- a/modules/ffmpeg/producer/util/util.h
+++ b/modules/ffmpeg/producer/util/util.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/producer/video/video_decoder.cpp b/modules/ffmpeg/producer/video/video_decoder.cpp
index 91d7161e49ed7bd60654ab5966c2e58f55aa5771..d35fe67548a6032345a80a4031872f91b56088d6 100644 (file)
--- a/modules/ffmpeg/producer/video/video_decoder.cpp
+++ b/modules/ffmpeg/producer/video/video_decoder.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ffmpeg/producer/video/video_decoder.h b/modules/ffmpeg/producer/video/video_decoder.h
index d84ae6abc0f28e99b0d432a863409d17106b6784..b968849cd9c681bd82df937e181860c4130332dd 100644 (file)
--- a/modules/ffmpeg/producer/video/video_decoder.h
+++ b/modules/ffmpeg/producer/video/video_decoder.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/flash/StdAfx.cpp b/modules/flash/StdAfx.cpp
index f2b946afaae3a37fd2191bec9f0ffa048cfadf85..ddb65ceb2e8445176b43336a38017a090dbcb496 100644 (file)
--- a/modules/flash/StdAfx.cpp
+++ b/modules/flash/StdAfx.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/flash/StdAfx.h b/modules/flash/StdAfx.h
index 66089ebdefa4f832006f8bf3780ffea2e557ac69..29c01270e5069d28320e140b762d3a3c8020d7d0 100644 (file)
--- a/modules/flash/StdAfx.h
+++ b/modules/flash/StdAfx.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/flash/flash.cpp b/modules/flash/flash.cpp
index 1b3b5360dc62434aa91d6fa181341e8b1e2932ce..3645efcd6b29fa545a2836c842912824ff99746a 100644 (file)
--- a/modules/flash/flash.cpp
+++ b/modules/flash/flash.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/flash/flash.h b/modules/flash/flash.h
index bda6402f620fd17e3b90a243ae09bb5139b00ae9..9e19050c22b34cd0f7f17b4218acf7c55169e3c3 100644 (file)
--- a/modules/flash/flash.h
+++ b/modules/flash/flash.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/flash/interop/TimerHelper.h b/modules/flash/interop/TimerHelper.h
index a0de2b19e8bf86bdf0403c02860e15f912684e7e..57e7046b4268228eba400dde3c2f2784568dde28 100644 (file)
--- a/modules/flash/interop/TimerHelper.h
+++ b/modules/flash/interop/TimerHelper.h
@@ -1,5 +1,5 @@
 /*\r
-* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 *  This file is part of CasparCG.\r
 *\r

diff --git a/modules/flash/producer/FlashAxContainer.cpp b/modules/flash/producer/FlashAxContainer.cpp
index cca013ed9a0c3db99d6729b1beb9ebbd85c29bd8..a08416ddcfc185cb2e8f74fab24106cefbaeefb2 100644 (file)
--- a/modules/flash/producer/FlashAxContainer.cpp
+++ b/modules/flash/producer/FlashAxContainer.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/flash/producer/FlashAxContainer.h b/modules/flash/producer/FlashAxContainer.h
index e5663e0a8fff921170d3fd598cd65f33a16c744f..fbd5d662696ece1746de681b4fac593d4c411bab 100644 (file)
--- a/modules/flash/producer/FlashAxContainer.h
+++ b/modules/flash/producer/FlashAxContainer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/flash/producer/cg_producer.cpp b/modules/flash/producer/cg_producer.cpp
index 6244ab11a92a89af52d354a2f18f557d26ba1f97..46e39fa1667a2355c5ad6163dd7b6e7dd8e27730 100644 (file)
--- a/modules/flash/producer/cg_producer.cpp
+++ b/modules/flash/producer/cg_producer.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/flash/producer/cg_producer.h b/modules/flash/producer/cg_producer.h
index 7e8140e26f6005bc8a5ad6e0701218bd62a6e7a3..9083b0a7c90abb09dacfa5452f657e707ab274c4 100644 (file)
--- a/modules/flash/producer/cg_producer.h
+++ b/modules/flash/producer/cg_producer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index db5022b4931dff51122f36d9583b3271bba5774b..a0a54c35dc3cd88f1b8a178d99e0b1eae420b3e3 100644 (file)
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/flash/producer/flash_producer.h b/modules/flash/producer/flash_producer.h
index e4f37fe9a845f59a2680b0976e1c5328d185e934..2f7af7637aaa20460c6f66b52a971ecdc67ed794 100644 (file)
--- a/modules/flash/producer/flash_producer.h
+++ b/modules/flash/producer/flash_producer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/flash/util/swf.cpp b/modules/flash/util/swf.cpp
index 0c2cb95f26cbc6ae2702f18112adee1ecc010e9f..77ce18f464e3c5375f46248b1203b993ea2a6306 100644 (file)
--- a/modules/flash/util/swf.cpp
+++ b/modules/flash/util/swf.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/flash/util/swf.h b/modules/flash/util/swf.h
index 2017c6db8728802db93f2f081881b0bd72d0efa5..94ece48f24684f2e54b05c463ca1153d8fd15b32 100644 (file)
--- a/modules/flash/util/swf.h
+++ b/modules/flash/util/swf.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/image/consumer/image_consumer.cpp b/modules/image/consumer/image_consumer.cpp
index ce3d3689464b37e2e5481ec9144afdd53fce84af..78b524a2f78f8cc48653f1d8a5e9fb3a67ad032b 100644 (file)
--- a/modules/image/consumer/image_consumer.cpp
+++ b/modules/image/consumer/image_consumer.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/image/consumer/image_consumer.h b/modules/image/consumer/image_consumer.h
index d5e482b6f54ecd985be404d0da4dc4399e30f392..6894987ba9df0ef071b5ed23d7caefc4f9cac0e8 100644 (file)
--- a/modules/image/consumer/image_consumer.h
+++ b/modules/image/consumer/image_consumer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/image/image.cpp b/modules/image/image.cpp
index 82517a4fc5077fba1d2292a3cf72856dddbe8903..b2e0d003882f9843f8e12c82fec483035181997c 100644 (file)
--- a/modules/image/image.cpp
+++ b/modules/image/image.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/image/image.h b/modules/image/image.h
index 512afff49717284c8132bcd066f6a2b426836d42..cf9a7b74945efb6142dc3f6c90accdcf49aec46e 100644 (file)
--- a/modules/image/image.h
+++ b/modules/image/image.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/image/producer/image_producer.cpp b/modules/image/producer/image_producer.cpp
index 11fbdd63758d8673b72a2da07e2ab21e4c706bab..b08dc4923d6486be2a3f74a365b40d33e5aa0553 100644 (file)
--- a/modules/image/producer/image_producer.cpp
+++ b/modules/image/producer/image_producer.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/image/producer/image_producer.h b/modules/image/producer/image_producer.h
index 2886836278f1b2f1c1665b0f1a422eca05f604d1..51101db46c32fad175d67161c8dfb67e0e6d7b5c 100644 (file)
--- a/modules/image/producer/image_producer.h
+++ b/modules/image/producer/image_producer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/image/producer/image_scroll_producer.cpp b/modules/image/producer/image_scroll_producer.cpp
index 6e2ea7afd088b0ca592c8d8d711107592d6c61cd..ebc5faa25cb3b69345c5f8ae5b8206f41b8e3cec 100644 (file)
--- a/modules/image/producer/image_scroll_producer.cpp
+++ b/modules/image/producer/image_scroll_producer.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/image/producer/image_scroll_producer.h b/modules/image/producer/image_scroll_producer.h
index 08b083fc36385533863ce4449bb62d2c94d158eb..c9a1c92f20ec1dd83a9586573f6e680db0b66594 100644 (file)
--- a/modules/image/producer/image_scroll_producer.h
+++ b/modules/image/producer/image_scroll_producer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/image/util/image_algorithms.cpp b/modules/image/util/image_algorithms.cpp
index a5630e1532ae442ffa0f00bb142f82b7e02b9aef..4f3e5e03d7b816b38c2c07443520faff62c6458b 100644 (file)
--- a/modules/image/util/image_algorithms.cpp
+++ b/modules/image/util/image_algorithms.cpp
@@ -1,3 +1,24 @@
+/*\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
+*\r
+* This file is part of CasparCG (www.casparcg.com).\r
+*\r
+* CasparCG is free software: you can redistribute it and/or modify\r
+* it under the terms of the GNU General Public License as published by\r
+* the Free Software Foundation, either version 3 of the License, or\r
+* (at your option) any later version.\r
+*\r
+* CasparCG is distributed in the hope that it will be useful,\r
+* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+* GNU General Public License for more details.\r
+*\r
+* You should have received a copy of the GNU General Public License\r
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.\r
+*\r
+* Author: Helge Norberg, helge.norberg@svt.se.com\r
+*/\r
+\r
 #include <vector>\r
 #include <stdint.h>\r
 #include "../util/image_algorithms.h"\r

diff --git a/modules/image/util/image_algorithms.h b/modules/image/util/image_algorithms.h
index 08559fc396c0e1e83599fdbb31affe06df8b195c..3ed2a059b150568223c68c017eb96532007474fd 100644 (file)
--- a/modules/image/util/image_algorithms.h
+++ b/modules/image/util/image_algorithms.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/image/util/image_loader.cpp b/modules/image/util/image_loader.cpp
index 2f61611031fe2f3fed980128e6e42f78a472f930..a2ac56591844aa2d1bc7726667a4939c6a69549b 100644 (file)
--- a/modules/image/util/image_loader.cpp
+++ b/modules/image/util/image_loader.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/image/util/image_loader.h b/modules/image/util/image_loader.h
index 18cd5bcff9713b37918cc09bd52c36d6a16f4561..32427572b5a0fe24428074cd5fb6c8b50c9c3081 100644 (file)
--- a/modules/image/util/image_loader.h
+++ b/modules/image/util/image_loader.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/image/util/image_view.h b/modules/image/util/image_view.h
index 422ab3c1ed270069c9a72781bf04eb26ab040808..dfeb4adfd303bd2b3aaaf1ec1237c38bb11cc9f1 100644 (file)
--- a/modules/image/util/image_view.h
+++ b/modules/image/util/image_view.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/oal/consumer/oal_consumer.cpp b/modules/oal/consumer/oal_consumer.cpp
index 89a1c15a9ea0c57d962102125a206f02e6c27262..f7e9990f8474eed82fb13c0d0cd3b6dc01cf3914 100644 (file)
--- a/modules/oal/consumer/oal_consumer.cpp
+++ b/modules/oal/consumer/oal_consumer.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+* Copyright 2013 Sveriges Television AB http://casparcg.com/
 *
 * This file is part of CasparCG (www.casparcg.com).
 *

diff --git a/modules/oal/consumer/oal_consumer.h b/modules/oal/consumer/oal_consumer.h
index 6d8dd04e68405e20470ca41f18732aeb130e80d9..76ebed176f80451c2833e2cd74c9a45be792d7f8 100644 (file)
--- a/modules/oal/consumer/oal_consumer.h
+++ b/modules/oal/consumer/oal_consumer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/oal/oal.cpp b/modules/oal/oal.cpp
index 696fe3ea2a70d69d80e2f3344f0c5dd8844d996c..15446a9afe9b94f7f4447d14b0f7a85f90f4eef3 100644 (file)
--- a/modules/oal/oal.cpp
+++ b/modules/oal/oal.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/oal/oal.h b/modules/oal/oal.h
index 5bf91240432d5acfbf6f7120654f862a1c4e7d69..b71ace19601719482839bbc1adf4419720fe501b 100644 (file)
--- a/modules/oal/oal.h
+++ b/modules/oal/oal.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ogl/consumer/ogl_consumer.cpp b/modules/ogl/consumer/ogl_consumer.cpp
index f3813637023b9a66a76c2ae40d997b4461ff1261..bfee074b1b606e0f34401bae8646dc14d0beb1b8 100644 (file)
--- a/modules/ogl/consumer/ogl_consumer.cpp
+++ b/modules/ogl/consumer/ogl_consumer.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ogl/consumer/ogl_consumer.h b/modules/ogl/consumer/ogl_consumer.h
index 611e8f651d225740ca0a5c33ae1b3d6c9eff7dc6..bfe877f6cf3f9efd7e1eb62f14eaab512d02707c 100644 (file)
--- a/modules/ogl/consumer/ogl_consumer.h
+++ b/modules/ogl/consumer/ogl_consumer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ogl/ogl.cpp b/modules/ogl/ogl.cpp
index ab3086d36e0ad0f7015a6df6c4046148563f2b66..d6346e35a37a2d3cd39080e369fed3d375c41d91 100644 (file)
--- a/modules/ogl/ogl.cpp
+++ b/modules/ogl/ogl.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/modules/ogl/ogl.h b/modules/ogl/ogl.h
index bd928d1e7ac5aec6af0eeff473c18f07a0f82267..74a90fa7b5f4d14ea4e76072e25c22f847ab871b 100644 (file)
--- a/modules/ogl/ogl.h
+++ b/modules/ogl/ogl.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/StdAfx.cpp b/protocol/StdAfx.cpp
index 78dab68fd5d01b591d8193f52fbfecde708e6bcb..50af69824335d59939e78076a13b966999e979e3 100644 (file)
--- a/protocol/StdAfx.cpp
+++ b/protocol/StdAfx.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/StdAfx.h b/protocol/StdAfx.h
index 67b6ccabcefb6b3dcc4a7838edb6fafc6ecb71e7..ae0cd2e8fe9a21e8ebb97a2f07b124697e408b82 100644 (file)
--- a/protocol/StdAfx.h
+++ b/protocol/StdAfx.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/amcp/AMCPCommand.h b/protocol/amcp/AMCPCommand.h
index b0200a95a6930b557845a570bf170e87035211aa..5de163fd0f721b2caad8ef80f7c0f04e42835e12 100644 (file)
--- a/protocol/amcp/AMCPCommand.h
+++ b/protocol/amcp/AMCPCommand.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/amcp/AMCPCommandQueue.cpp b/protocol/amcp/AMCPCommandQueue.cpp
index 7a50158671d9be5f26d1ba3463490bc9f08feb9e..d47bcbac0df29778a303fee08503e26f0a32c495 100644 (file)
--- a/protocol/amcp/AMCPCommandQueue.cpp
+++ b/protocol/amcp/AMCPCommandQueue.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/amcp/AMCPCommandQueue.h b/protocol/amcp/AMCPCommandQueue.h
index 58756c83201dac1a3c8bcd6d21faad260597767a..9bccd8b3328cff04004c2ecc90f6ea5009fe1666 100644 (file)
--- a/protocol/amcp/AMCPCommandQueue.h
+++ b/protocol/amcp/AMCPCommandQueue.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp
index 68a9dd074fdf3a5416ce4c0b2770203d47678606..581928a2509e0cfd95e7e3efed395cfd74da7dc8 100644 (file)
--- a/protocol/amcp/AMCPCommandsImpl.cpp
+++ b/protocol/amcp/AMCPCommandsImpl.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/amcp/AMCPCommandsImpl.h b/protocol/amcp/AMCPCommandsImpl.h
index 7986cc5912863a45967c662361b51444b4e0b6c1..788887a337ee569e3eb588492fecc20407cc1e07 100644 (file)
--- a/protocol/amcp/AMCPCommandsImpl.h
+++ b/protocol/amcp/AMCPCommandsImpl.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/amcp/AMCPProtocolStrategy.cpp b/protocol/amcp/AMCPProtocolStrategy.cpp
index 29e6b5c81676f0f734e64c617ecca5855fc511b6..638406cd24c3f3a3390bd7a0cb549eea2e8cd095 100644 (file)
--- a/protocol/amcp/AMCPProtocolStrategy.cpp
+++ b/protocol/amcp/AMCPProtocolStrategy.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/amcp/AMCPProtocolStrategy.h b/protocol/amcp/AMCPProtocolStrategy.h
index 46f00ecbcd83b2d2b0ecf84f0572d813f9b718a1..90b597974080ae8c8f478bbd758d5bc9dbdfb065 100644 (file)
--- a/protocol/amcp/AMCPProtocolStrategy.h
+++ b/protocol/amcp/AMCPProtocolStrategy.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/asio/io_service_manager.cpp b/protocol/asio/io_service_manager.cpp
index 4e02efa601289dcbe4bfb169e02ffea3e2e3165f..3261c1816a301488797333aac203b273c9df22a6 100644 (file)
--- a/protocol/asio/io_service_manager.cpp
+++ b/protocol/asio/io_service_manager.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+* Copyright 2013 Sveriges Television AB http://casparcg.com/
 *
 * This file is part of CasparCG (www.casparcg.com).
 *

diff --git a/protocol/asio/io_service_manager.h b/protocol/asio/io_service_manager.h
index 92653b85b2e0f51d2555dda0dc277990b99f5f90..cc6f253ebd92b6c2a656d7116f39b383daa54d4e 100644 (file)
--- a/protocol/asio/io_service_manager.h
+++ b/protocol/asio/io_service_manager.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+* Copyright 2013 Sveriges Television AB http://casparcg.com/
 *
 * This file is part of CasparCG (www.casparcg.com).
 *

diff --git a/protocol/cii/CIICommand.h b/protocol/cii/CIICommand.h
index ea9146f93dfad12a2b0f4ee2c685173b1bfac0d8..5e9af3f199b2147e59501d491f68f38d456ffa25 100644 (file)
--- a/protocol/cii/CIICommand.h
+++ b/protocol/cii/CIICommand.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/cii/CIICommandsImpl.cpp b/protocol/cii/CIICommandsImpl.cpp
index 3253097f754f2a39ea54521bc1a29b11d1b34d4f..5c1449501085ff19c656749dfd9ad7d3ea21cfb3 100644 (file)
--- a/protocol/cii/CIICommandsImpl.cpp
+++ b/protocol/cii/CIICommandsImpl.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/cii/CIICommandsImpl.h b/protocol/cii/CIICommandsImpl.h
index 166fff5dca10d6022c50d185fb660dcaee1e5738..a66323dab9f797efbd2bd4c28c021dad7d8e57f2 100644 (file)
--- a/protocol/cii/CIICommandsImpl.h
+++ b/protocol/cii/CIICommandsImpl.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/cii/CIIProtocolStrategy.cpp b/protocol/cii/CIIProtocolStrategy.cpp
index 9e6769dbb8505c81618c77bc0fd56271ad46fc2e..50306738f0f3c1e4fec4d21be9d08bad46e29cbf 100644 (file)
--- a/protocol/cii/CIIProtocolStrategy.cpp
+++ b/protocol/cii/CIIProtocolStrategy.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/cii/CIIProtocolStrategy.h b/protocol/cii/CIIProtocolStrategy.h
index 88a3b6fd0416a00571a67d40d5a3a1480a095706..939a602d0d9f2bacd3710564906f52e73b334536 100644 (file)
--- a/protocol/cii/CIIProtocolStrategy.h
+++ b/protocol/cii/CIIProtocolStrategy.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/clk/CLKProtocolStrategy.cpp b/protocol/clk/CLKProtocolStrategy.cpp
index dda74314bd6cb872062f261fbf47b95799174dad..b839d95a4900d9afaace6b096884dc6424ac9909 100644 (file)
--- a/protocol/clk/CLKProtocolStrategy.cpp
+++ b/protocol/clk/CLKProtocolStrategy.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/clk/CLKProtocolStrategy.h b/protocol/clk/CLKProtocolStrategy.h
index a2b8ab5dc717e8c43f3da2409237b16e8e22ac74..6966e158fdbf4a2c1c15906dd7521b083caf6941 100644 (file)
--- a/protocol/clk/CLKProtocolStrategy.h
+++ b/protocol/clk/CLKProtocolStrategy.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/clk/clk_command_processor.cpp b/protocol/clk/clk_command_processor.cpp
index d614a6ae10e4c3623336e61d7e153cdc3ae19c8c..4c59dd355ffb937f1e0de3e98a646d24e53e9da3 100644 (file)
--- a/protocol/clk/clk_command_processor.cpp
+++ b/protocol/clk/clk_command_processor.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/clk/clk_command_processor.h b/protocol/clk/clk_command_processor.h
index 6882cba4fa26c926efe7b73b63a474db58936569..6b84d4c88d68583fad10541d46b60db4f2910726 100644 (file)
--- a/protocol/clk/clk_command_processor.h
+++ b/protocol/clk/clk_command_processor.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/clk/clk_commands.cpp b/protocol/clk/clk_commands.cpp
index 502fb78c23e22936aa603b1a39428a057a3172b5..3c9b93c19b449dbf9d989452c372fe8bec44b14d 100644 (file)
--- a/protocol/clk/clk_commands.cpp
+++ b/protocol/clk/clk_commands.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/clk/clk_commands.h b/protocol/clk/clk_commands.h
index af6f1e83bedc58e7c7ab6ab800b16838d1149a30..6d742e4c6e1d6390c8ac877350068c78a596b3f2 100644 (file)
--- a/protocol/clk/clk_commands.h
+++ b/protocol/clk/clk_commands.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/osc/client.cpp b/protocol/osc/client.cpp
index b9cb03f399138ff2bbf7cc18f08d2cc8d693e768..6dcd32a0e5c362de6ec2ef3eb975925c4f08bdf7 100644 (file)
--- a/protocol/osc/client.cpp
+++ b/protocol/osc/client.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+* Copyright 2013 Sveriges Television AB http://casparcg.com/
 *
 * This file is part of CasparCG (www.casparcg.com).
 *

diff --git a/protocol/osc/client.h b/protocol/osc/client.h
index d79cccd53adc6324a03c24debde6503808988741..cf1196fb97772e7cd596e41a0297fa912c1d522d 100644 (file)
--- a/protocol/osc/client.h
+++ b/protocol/osc/client.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+* Copyright 2013 Sveriges Television AB http://casparcg.com/
 *
 * This file is part of CasparCG (www.casparcg.com).
 *
@@ -17,6 +17,7 @@
 * along with CasparCG. If not, see <http://www.gnu.org/licenses/>.
 *
 * Author: Robert Nagy, ronag89@gmail.com
+* Author: Helge Norberg, helge.norberg@svt.se
 */
 
 #pragma once

diff --git a/protocol/util/AsyncEventServer.cpp b/protocol/util/AsyncEventServer.cpp
index 851997bc15c51017ed2e6b0237b16a0997d98829..0e1fffe75b175510ea4db25a1553edf519d26e17 100644 (file)
--- a/protocol/util/AsyncEventServer.cpp
+++ b/protocol/util/AsyncEventServer.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/util/AsyncEventServer.h b/protocol/util/AsyncEventServer.h
index bc26ce71bdfb167ed786422e0e66cc8d52da76b8..2724da8ef00c1b6c7d37cfd90229bf26aed67071 100644 (file)
--- a/protocol/util/AsyncEventServer.h
+++ b/protocol/util/AsyncEventServer.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/util/ClientInfo.h b/protocol/util/ClientInfo.h
index 77c7e58dae96d4f37357c6bfce042946152e3213..b21c687f835b03bd677ff2c5f00c69cbc97f2933 100644 (file)
--- a/protocol/util/ClientInfo.h
+++ b/protocol/util/ClientInfo.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/util/ProtocolStrategy.h b/protocol/util/ProtocolStrategy.h
index 8c95e970af9a44c6066045e5737b27203e1803be..cdc71348b3fef136d0b2bb4edb5dd8bbfefa0db4 100644 (file)
--- a/protocol/util/ProtocolStrategy.h
+++ b/protocol/util/ProtocolStrategy.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/util/SocketInfo.cpp b/protocol/util/SocketInfo.cpp
index eefa0bddb92328ce65c14178ab2c9f404516a12a..cfec4d4da282032b9f305ec5f09ffe0157aa70e4 100644 (file)
--- a/protocol/util/SocketInfo.cpp
+++ b/protocol/util/SocketInfo.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/util/SocketInfo.h b/protocol/util/SocketInfo.h
index 29e32402ff49ed32dc85035ec8a510d8da8bb740..5b8b4514b3610449147e07d1e1259a02e0fabc1a 100644 (file)
--- a/protocol/util/SocketInfo.h
+++ b/protocol/util/SocketInfo.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/util/Thread.cpp b/protocol/util/Thread.cpp
index 1e1099b0b983eee81f693f838f072eb2a2af7331..39199f6d8b01da4ddd65addc8f3a2d12dbc33108 100644 (file)
--- a/protocol/util/Thread.cpp
+++ b/protocol/util/Thread.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/util/Thread.h b/protocol/util/Thread.h
index 92d6e4947f926427ab13c7495666c7b06a8f2328..46a00dbc7587d13bfbe795c5d376d4c0a7409313 100644 (file)
--- a/protocol/util/Thread.h
+++ b/protocol/util/Thread.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/util/stateful_protocol_strategy_wrapper.cpp b/protocol/util/stateful_protocol_strategy_wrapper.cpp
index 7c23e00583e13329ab0ec0d253455ea28153659c..316a9f7d94a431f3933f27ffde172ede2f12986b 100644 (file)
--- a/protocol/util/stateful_protocol_strategy_wrapper.cpp
+++ b/protocol/util/stateful_protocol_strategy_wrapper.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/protocol/util/stateful_protocol_strategy_wrapper.h b/protocol/util/stateful_protocol_strategy_wrapper.h
index e6a66d3b74662bcf811d7480f5018a0762ef65bf..1053e067d8189e2ba72bf2eb2a416e521fd6fbb7 100644 (file)
--- a/protocol/util/stateful_protocol_strategy_wrapper.h
+++ b/protocol/util/stateful_protocol_strategy_wrapper.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/shell/main.cpp b/shell/main.cpp
index 05a0359ae7455b94388668bd5b7ab2cdf8a75b51..36721b83ee0809879773d68456849a0369b16f13 100644 (file)
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/shell/resource.h b/shell/resource.h
index aebc8e6fa480f1ef0224520acad6fbc7391e77b2..08ef8d5ecf47dd14803fd9ec1e95e33ba0ee1574 100644 (file)
Binary files a/shell/resource.h and b/shell/resource.h differ

diff --git a/shell/server.cpp b/shell/server.cpp
index 9b0f5cb9d971f6e3f58d8f1946e0a663deb4a51c..34fbb829b2ab07e31a067ab1146c824bf4fcc796 100644 (file)
--- a/shell/server.cpp
+++ b/shell/server.cpp
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r

diff --git a/shell/server.h b/shell/server.h
index 01ed69b8109f71ad2786977eb1600c08e1266fb5..571f9e330352a9338575bac874f3ad38871827d2 100644 (file)
--- a/shell/server.h
+++ b/shell/server.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r