]> git.sesse.net Git - casparcg/blobdiff - core/video_format.cpp
Move fix issue #410 to VS include file.
[casparcg] / core / video_format.cpp
index eb9b4bcc38ab3a15737174fd9160fd51f0fc94a4..792afb4623aeef64da6c22a2003c4af858a1a2bd 100644 (file)
@@ -26,8 +26,7 @@
 #include <boost/algorithm/string.hpp>
 
 namespace caspar { namespace core {
-#pragma warning( push ) 
-#pragma warning( disable : 4592)       
+       
        const std::vector<video_format_desc> format_descs = {
                { video_format::pal,          720,  576,  1024, 576,  field_mode::upper,       25,    1,    L"PAL",          { 1920                         } },
                { video_format::ntsc,         720,  486,  720,  540,  field_mode::lower,       30000, 1001, L"NTSC",         { 1602, 1601, 1602, 1601, 1602 } },
@@ -67,7 +66,7 @@ namespace caspar { namespace core {
                { video_format::dci2160p2500, 4096, 2160, 4096, 2160, field_mode::progressive, 25,    1,    L"dci2160p2500", { 1920                         } },
                { video_format::invalid,      0,    0,    0,    0,    field_mode::progressive, 1,     1,    L"invalid",      { 1                            } }
        };
-#pragma warning( pop ) 
+
 video_format_desc::video_format_desc(
                video_format format,
                int width,