2.0.0.2: Moved video_format.h into correct folder.

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

diff --git a/core/consumer/bluefish/bluefish_consumer.h b/core/consumer/bluefish/bluefish_consumer.h
index 71804c20c683cf0d6fb0a75d47105a65eda94c6f..f234c4ac70abfde07e74e49d844436cae70a2ffa 100644 (file)
--- a/core/consumer/bluefish/bluefish_consumer.h
+++ b/core/consumer/bluefish/bluefish_consumer.h
@@ -19,7 +19,7 @@
 */\r
 #pragma once\r
 \r
-#include "../../format/video_format.h"\r
+#include "../../video_format.h"\r
 #include "../../consumer/frame_consumer.h"\r
 \r
 namespace caspar { namespace core { namespace bluefish {\r

diff --git a/core/consumer/bluefish/memory.h b/core/consumer/bluefish/memory.h
index b27c3cfff91749f533c0b992790ebc388486fa0e..57555b2904ba8d61202f20703c21db57f62be60c 100644 (file)
--- a/core/consumer/bluefish/memory.h
+++ b/core/consumer/bluefish/memory.h
@@ -3,7 +3,7 @@
 #include <Windows.h>\r
 \r
 #include <BlueVelvet4.h>\r
-#include "../../format/video_format.h"\r
+#include "../../video_format.h"\r
 \r
 #include <common/memory/page_locked_allocator.h>\r
 \r

diff --git a/core/consumer/bluefish/util.h b/core/consumer/bluefish/util.h
index e5b51658eb9e1e6560ec5e7e615b3845d95d9f41..cad5c6fc0c4434b9f7577fdb546ec6c2a2f2e3a7 100644 (file)
--- a/core/consumer/bluefish/util.h
+++ b/core/consumer/bluefish/util.h
@@ -1,7 +1,7 @@
 #pragma once\r
 \r
 #include <BlueVelvet4.h>\r
-#include "../../format/video_format.h"\r
+#include "../../video_format.h"\r
 \r
 namespace caspar { namespace core { namespace bluefish {\r
        \r

diff --git a/core/consumer/decklink/decklink_consumer.cpp b/core/consumer/decklink/decklink_consumer.cpp
index 0d3db69cc27591ea042925c45151654a0c5f4bc2..f83bb8c23c765c388763424d4b05766aae627bbc 100644 (file)
--- a/core/consumer/decklink/decklink_consumer.cpp
+++ b/core/consumer/decklink/decklink_consumer.cpp
@@ -26,7 +26,7 @@
 \r
 #include "DeckLinkAPI_h.h"\r
 \r
-#include "../../format/video_format.h"\r
+#include "../../video_format.h"\r
 #include "../../processor/read_frame.h"\r
 \r
 #include <common/concurrency/executor.h>\r

diff --git a/core/consumer/decklink/decklink_consumer.h b/core/consumer/decklink/decklink_consumer.h
index a1070db90bf79ba9bcd1c0f4416e9ae1dc45988e..8d972b2d927ec235e0ae8f5bbea60ace0c0be3d7 100644 (file)
--- a/core/consumer/decklink/decklink_consumer.h
+++ b/core/consumer/decklink/decklink_consumer.h
@@ -21,7 +21,7 @@
 \r
 #include "../../consumer/frame_consumer.h"\r
 \r
-#include "../../format/video_format.h"\r
+#include "../../video_format.h"\r
 \r
 namespace caspar { namespace core { namespace decklink {\r
 \r

diff --git a/core/consumer/decklink/util.h b/core/consumer/decklink/util.h
index a2b142bcd0e57b69d6aa76e4dd969cb3294cf87a..ffb27f58eb64033f9233e91a0862dcdab78eddfa 100644 (file)
--- a/core/consumer/decklink/util.h
+++ b/core/consumer/decklink/util.h
@@ -1,6 +1,6 @@
 #pragma once\r
 \r
-#include "../../format/video_format.h"\r
+#include "../../video_format.h"\r
 \r
 #include "DeckLinkAPI_h.h"\r
 \r

diff --git a/core/consumer/frame_consumer_device.cpp b/core/consumer/frame_consumer_device.cpp
index c8a6f8aa719171e8a32be50e57a16a13d6d6320c..8ef68465d735ea83b3d1448b289716415fce7540 100644 (file)
--- a/core/consumer/frame_consumer_device.cpp
+++ b/core/consumer/frame_consumer_device.cpp
@@ -6,7 +6,7 @@
 \r
 #include "frame_consumer_device.h"\r
 \r
-#include "../format/video_format.h"\r
+#include "../video_format.h"\r
 \r
 #include <common/concurrency/executor.h>\r
 #include <common/utility/timer.h>\r

diff --git a/core/consumer/oal/oal_consumer.cpp b/core/consumer/oal/oal_consumer.cpp
index 4ce4ab6428d0a8699f2ce485af559bca727ae21a..6c4884bcf29577167cd4ac0b8da9f7c2f50141f2 100644 (file)
--- a/core/consumer/oal/oal_consumer.cpp
+++ b/core/consumer/oal/oal_consumer.cpp
@@ -22,7 +22,7 @@
 \r
 #include "oal_consumer.h"\r
 \r
-#include "../../format/video_format.h"\r
+#include "../../video_format.h"\r
 \r
 #include "../../processor/read_frame.h"\r
 \r

diff --git a/core/consumer/oal/oal_consumer.h b/core/consumer/oal/oal_consumer.h
index 9a2875f61db28aef6989638348434a0ff906d6fc..f4a7fb31695105171a5c82782846fd5cf5885185 100644 (file)
--- a/core/consumer/oal/oal_consumer.h
+++ b/core/consumer/oal/oal_consumer.h
@@ -19,7 +19,7 @@
 */\r
 #pragma once\r
 \r
-#include "../../format/video_format.h"\r
+#include "../../video_format.h"\r
 #include "../../consumer/frame_consumer.h"\r
 \r
 namespace caspar { namespace core { namespace oal {\r

diff --git a/core/consumer/ogl/ogl_consumer.cpp b/core/consumer/ogl/ogl_consumer.cpp
index 50205c608ed8a2ca3a7a2ea8d84eccf3e1c2adec..02209b3533df87859bc3a11f4ce5b999c1813339 100644 (file)
--- a/core/consumer/ogl/ogl_consumer.cpp
+++ b/core/consumer/ogl/ogl_consumer.cpp
@@ -22,7 +22,7 @@
 \r
 #include "ogl_consumer.h"\r
 \r
-#include "../../format/video_format.h"\r
+#include "../../video_format.h"\r
 #include "../../processor/read_frame.h"\r
 \r
 #include <common/gl/gl_check.h>\r

diff --git a/core/consumer/ogl/ogl_consumer.h b/core/consumer/ogl/ogl_consumer.h
index 66d829fa66209f974c7f9894b14cf4cf7530f213..7ba0f8243fbca71e9dd4dacc461cb61805b27fa6 100644 (file)
--- a/core/consumer/ogl/ogl_consumer.h
+++ b/core/consumer/ogl/ogl_consumer.h
@@ -20,7 +20,7 @@
 #pragma once\r
 \r
 #include "../../consumer/frame_consumer.h"\r
-#include "../../format/video_format.h"\r
+#include "../../video_format.h"\r
 \r
 namespace caspar { namespace core { namespace ogl {\r
 \r

diff --git a/core/core.vcxproj b/core/core.vcxproj
index 1bb5443e484f477f57b641007b58bb4034e1da17..fd5d17e5dda621e0e1c60cd35173420dad9e6511 100644 (file)
--- a/core/core.vcxproj
+++ b/core/core.vcxproj
@@ -163,7 +163,6 @@
     <ClInclude Include="consumer\frame_consumer.h" />\r
     <ClInclude Include="consumer\oal\oal_consumer.h" />\r
     <ClInclude Include="consumer\ogl\ogl_consumer.h" />\r
-    <ClInclude Include="format\video_format.h" />\r
     <ClInclude Include="processor\audio_processor.h" />\r
     <ClInclude Include="processor\device_buffer.h" />\r
     <ClInclude Include="processor\frame_processor_device.h" />\r
@@ -204,6 +203,7 @@
     <ClInclude Include="protocol\media.h" />\r
     <ClInclude Include="configuration.h" />\r
     <ClInclude Include="version.h" />\r
+    <ClInclude Include="video_format.h" />\r
     <CustomBuildStep Include="consumers\bluefish\BluefishException.h" />\r
     <CustomBuildStep Include="consumers\bluefish\BluefishFrameManager.h" />\r
     <CustomBuildStep Include="consumers\bluefish\BluefishPlaybackStrategy.h" />\r
@@ -237,10 +237,6 @@
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../StdAfx.h</PrecompiledHeaderFile>\r
     </ClCompile>\r
-    <ClCompile Include="format\video_format.cpp">\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
-    </ClCompile>\r
     <ClCompile Include="processor\audio_processor.cpp">\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../StdAfx.h</PrecompiledHeaderFile>\r
@@ -376,6 +372,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>\r
     </ClCompile>\r
+    <ClCompile Include="video_format.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Midl Include="consumer\decklink\DeckLinkAPI.idl">\r

diff --git a/core/core.vcxproj.filters b/core/core.vcxproj.filters
index dc3f57a2971e851d0d03a961213cccc5567fbc13..9bce3e7ab91f9ce58bcfd74c28915ec0f97bf6eb 100644 (file)
--- a/core/core.vcxproj.filters
+++ b/core/core.vcxproj.filters
@@ -231,9 +231,6 @@
     <ClInclude Include="StdAfx.h">\r
       <Filter>Afx</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="format\video_format.h">\r
-      <Filter>Source\channel</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="processor\pixel_format.h">\r
       <Filter>Source\channel\processor</Filter>\r
     </ClInclude>\r
@@ -252,6 +249,9 @@
     <ClInclude Include="processor\draw_frame.h">\r
       <Filter>Source\channel\processor\frame</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="video_format.h">\r
+      <Filter>Source</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="protocol\amcp\AMCPCommandQueue.cpp">\r
@@ -368,9 +368,6 @@
     <ClCompile Include="StdAfx.cpp">\r
       <Filter>Afx</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="format\video_format.cpp">\r
-      <Filter>Source\channel</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="producer\flash\Flash9e_i.c">\r
       <Filter>Source\channel\producer\flash\interop</Filter>\r
     </ClCompile>\r
@@ -380,6 +377,9 @@
     <ClCompile Include="processor\draw_frame.cpp">\r
       <Filter>Source\channel\processor\frame</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="video_format.cpp">\r
+      <Filter>Source</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Midl Include="consumer\decklink\DeckLinkAPI_v7_3.idl">\r

diff --git a/core/processor/draw_frame.h b/core/processor/draw_frame.h
index 5e6f51aec7410374e7f17c4dd302a6daec37f0b4..951ab4b11f3b93556802ccd8b3407b37c32faef1 100644 (file)
--- a/core/processor/draw_frame.h
+++ b/core/processor/draw_frame.h
@@ -4,7 +4,7 @@
 \r
 #include "draw_frame.h"\r
 \r
-#include "../format/video_format.h"\r
+#include "../video_format.h"\r
 \r
 #include <boost/noncopyable.hpp>\r
 #include <boost/range/iterator_range.hpp>\r

diff --git a/core/processor/frame_processor_device.cpp b/core/processor/frame_processor_device.cpp
index da319a9f10cebf454c4b7f704570eeaa723e393f..70b22eb53e96967713909dae0d4e2db3a47c1064 100644 (file)
--- a/core/processor/frame_processor_device.cpp
+++ b/core/processor/frame_processor_device.cpp
@@ -8,7 +8,7 @@
 #include "write_frame.h"\r
 #include "read_frame.h"\r
 \r
-#include "../format/video_format.h"\r
+#include "../video_format.h"\r
 \r
 #include <common/exception/exceptions.h>\r
 #include <common/concurrency/executor.h>\r

diff --git a/core/processor/frame_processor_device.h b/core/processor/frame_processor_device.h
index 3e8a01ddf4da745c24cc8157b5d6acd95e77092e..394699b7ce706f772dd1dc17046a238624ab4388 100644 (file)
--- a/core/processor/frame_processor_device.h
+++ b/core/processor/frame_processor_device.h
@@ -24,7 +24,7 @@
 #include "pixel_format.h"\r
 #include "write_frame.h"\r
 \r
-#include "../format/video_format.h"\r
+#include "../video_format.h"\r
 \r
 #include <common/memory/safe_ptr.h>\r
 \r

diff --git a/core/processor/image_kernel.h b/core/processor/image_kernel.h
index 9544d4955a40fa3b2da69638cd207991aab79b92..2a7fff3f1e7e504508c83ff3dcc0bf378ca776c8 100644 (file)
--- a/core/processor/image_kernel.h
+++ b/core/processor/image_kernel.h
@@ -1,6 +1,6 @@
 #pragma once\r
 \r
-#include "../format/video_format.h"\r
+#include "../video_format.h"\r
 \r
 #include "frame_processor_device.h"\r
 \r

diff --git a/core/processor/image_processor.h b/core/processor/image_processor.h
index a233e7c0f120d78607c92bd336445d7c874ff38b..8933f6f0539e5a3e410d79705c2c8445aaeaef2b 100644 (file)
--- a/core/processor/image_processor.h
+++ b/core/processor/image_processor.h
@@ -2,7 +2,7 @@
 \r
 #include "host_buffer.h"\r
 \r
-#include "../format/video_format.h"\r
+#include "../video_format.h"\r
 \r
 #include <boost/tuple/tuple.hpp>\r
 #include <boost/thread/future.hpp>\r

diff --git a/core/processor/write_frame.h b/core/processor/write_frame.h
index 341df8467a1ccb4c6763dc998ab684d85feed5f5..6f9b5e6d7330f0071a1cffe5608eb99a2318bb97 100644 (file)
--- a/core/processor/write_frame.h
+++ b/core/processor/write_frame.h
@@ -6,7 +6,7 @@
 \r
 #include "draw_frame.h"\r
 \r
-#include "../format/video_format.h"\r
+#include "../video_format.h"\r
 \r
 #include <boost/noncopyable.hpp>\r
 #include <boost/range/iterator_range.hpp>\r

diff --git a/core/producer/ffmpeg/ffmpeg_producer.cpp b/core/producer/ffmpeg/ffmpeg_producer.cpp
index ca4b83b95837d7bfae428b2803615e4389d5caac..e537a2d5ceb2560f176dac0ee7590de0b234330b 100644 (file)
--- a/core/producer/ffmpeg/ffmpeg_producer.cpp
+++ b/core/producer/ffmpeg/ffmpeg_producer.cpp
@@ -6,7 +6,7 @@
 #include "audio/audio_decoder.h"\r
 #include "video/video_decoder.h"\r
 \r
-#include "../../format/video_format.h"\r
+#include "../../video_format.h"\r
 #include "../../processor/draw_frame.h"\r
 \r
 #include <tbb/parallel_invoke.h>\r

diff --git a/core/producer/ffmpeg/input.cpp b/core/producer/ffmpeg/input.cpp
index 53807426405b14d9abd8bcf5740518b0e4dc4142..368beac24f1bd3438d29e1915573250da8fc6682 100644 (file)
--- a/core/producer/ffmpeg/input.cpp
+++ b/core/producer/ffmpeg/input.cpp
@@ -2,7 +2,7 @@
 \r
 #include "input.h"\r
 \r
-#include "../../format/video_format.h"\r
+#include "../../video_format.h"\r
 \r
 #include <common/concurrency/executor.h>\r
 \r

diff --git a/core/producer/ffmpeg/video/video_decoder.cpp b/core/producer/ffmpeg/video/video_decoder.cpp
index 0524543c730e4e847b2bf085dd53cd5c5705c79a..ee6018c30247d53115fd854c9842750c74024af4 100644 (file)
--- a/core/producer/ffmpeg/video/video_decoder.cpp
+++ b/core/producer/ffmpeg/video/video_decoder.cpp
@@ -2,7 +2,7 @@
 \r
 #include "video_decoder.h"\r
 \r
-#include "../../../format/video_format.h"\r
+#include "../../../video_format.h"\r
 #include "../../../processor/draw_frame.h"\r
 #include "../../../processor/frame_processor_device.h"\r
 \r

diff --git a/core/producer/flash/FlashAxContainer.h b/core/producer/flash/FlashAxContainer.h
index 464b2dcb47bf91d994f22c8c6337952623518927..aef82aa29bb4f09fab56b284274fa931a6716b59 100644 (file)
--- a/core/producer/flash/FlashAxContainer.h
+++ b/core/producer/flash/FlashAxContainer.h
@@ -31,7 +31,7 @@
 #include <ocmm.h>\r
 #include <vector>\r
 \r
-#include "../../format/video_format.h"\r
+#include "../../video_format.h"\r
 #include "axflash.h"\r
 //#import "progid:ShockwaveFlash.ShockwaveFlash.9" no_namespace, named_guids\r
 \r

diff --git a/core/producer/flash/cg_producer.h b/core/producer/flash/cg_producer.h
index cc8d65fc7d07e9d18408ed0c9ba09c58b9ad2d86..2570435167943dc8a2498cca983fd281e5d26613 100644 (file)
--- a/core/producer/flash/cg_producer.h
+++ b/core/producer/flash/cg_producer.h
@@ -1,7 +1,7 @@
 #pragma once\r
 \r
 #include "../frame_producer.h"\r
-#include "../../format/video_format.h"\r
+#include "../../video_format.h"\r
 #include "../../channel.h"\r
 \r
 namespace caspar { namespace core { namespace flash{\r

diff --git a/core/producer/flash/flash_producer.cpp b/core/producer/flash/flash_producer.cpp
index f7fc268ae5cd69780e2c54101fbe6273692e0e68..2178de5505809b623fcb9b506e7f6ef6474f888a 100644 (file)
--- a/core/producer/flash/flash_producer.cpp
+++ b/core/producer/flash/flash_producer.cpp
@@ -28,7 +28,7 @@
 #include "flash_producer.h"\r
 #include "FlashAxContainer.h"\r
 \r
-#include "../../format/video_format.h"\r
+#include "../../video_format.h"\r
 \r
 #include "../../processor/draw_frame.h"\r
 #include "../../processor/frame_processor_device.h"\r

diff --git a/core/producer/image/image_producer.cpp b/core/producer/image/image_producer.cpp
index 943be5ffbb68e8b75fa8ecca6d8c6011eab32d80..48f8ecfda0917942f5d126b1b8085e94daf86fd1 100644 (file)
--- a/core/producer/image/image_producer.cpp
+++ b/core/producer/image/image_producer.cpp
@@ -5,7 +5,7 @@
 \r
 #include "../../processor/frame_processor_device.h"\r
 #include "../../processor/draw_frame.h"\r
-#include "../../format/video_format.h"\r
+#include "../../video_format.h"\r
 \r
 #include <boost/assign.hpp>\r
 \r

diff --git a/core/producer/image/image_scroll_producer.cpp b/core/producer/image/image_scroll_producer.cpp
index 7d25b8ce7b7c38f3639d9aa832d0cd0038827db8..0bdd2c2372c34813a6c137c7a2d22086f4d69f51 100644 (file)
--- a/core/producer/image/image_scroll_producer.cpp
+++ b/core/producer/image/image_scroll_producer.cpp
@@ -6,7 +6,7 @@
 //\r
 //#include "../../processor/draw_frame.h"\r
 //#include "../../processor/draw_frame.h"\r
-//#include "../../format/video_format.h"\r
+//#include "../../video_format.h"\r
 //#include "../../processor/frame_processor_device.h"\r
 //#include "../../configuration.h"\r
 //\r

diff --git a/core/producer/layer.cpp b/core/producer/layer.cpp
index 8639677988d77ad63a0fb4480881877e62dcc632..99a5a0805e4f5ac588044510e1560af2d5749bcc 100644 (file)
--- a/core/producer/layer.cpp
+++ b/core/producer/layer.cpp
@@ -5,7 +5,7 @@
 #include "../processor/draw_frame.h"\r
 #include "../producer/frame_producer.h"\r
 \r
-#include "../format/video_format.h"\r
+#include "../video_format.h"\r
 \r
 namespace caspar { namespace core {\r
 \r

diff --git a/core/producer/transition/transition_producer.cpp b/core/producer/transition/transition_producer.cpp
index 9743fb79beb019e550971eab193a200116f055d9..a067e86e1109b3bbbda3fdb9f59b1368a7a2e5a8 100644 (file)
--- a/core/producer/transition/transition_producer.cpp
+++ b/core/producer/transition/transition_producer.cpp
@@ -21,7 +21,7 @@
 \r
 #include "transition_producer.h"\r
 \r
-#include "../../format/video_format.h"\r
+#include "../../video_format.h"\r
 #include "../../processor/draw_frame.h"\r
 #include "../../processor/draw_frame.h"\r
 #include "../../processor/frame_processor_device.h"\r

diff --git a/core/protocol/amcp/AMCPCommandsImpl.cpp b/core/protocol/amcp/AMCPCommandsImpl.cpp
index be33e11cea5f1827fd8a27acf2f93c4ba140c1d1..baeb86addf1b55d10e640e4ad923c7a5a3835537 100644 (file)
--- a/core/protocol/amcp/AMCPCommandsImpl.cpp
+++ b/core/protocol/amcp/AMCPCommandsImpl.cpp
@@ -23,7 +23,7 @@
 #include "AMCPCommandsImpl.h"\r
 #include "AMCPProtocolStrategy.h"\r
 #include "../../producer/frame_producer.h"\r
-#include "../../format/video_format.h"\r
+#include "../../video_format.h"\r
 #include "../../producer/flash/flash_producer.h"\r
 #include "../../producer/transition/transition_producer.h"\r
 #include <boost/lexical_cast.hpp>\r