2.0.2: Changed NTSC square-pixels dimensions.

[casparcg] / core / video_format.cpp

diff --git a/core/video_format.cpp b/core/video_format.cpp
index 8101abf0a851bec36bc1f5e7d25376868527820c..cb160fff6e85f909e0fedf8ae0bd313bde35ecde 100644 (file)
--- a/core/video_format.cpp
+++ b/core/video_format.cpp
@@ -38,18 +38,17 @@
        (m == field_mode::progressive ? 1 : 2),\\r
        ((w)*(h)*4),\\r
        (name),\\r
-       (2),\\r
        (48000),\\r
        (2),\\r
-       (static_cast<size_t>(48000.0*2.0/((double)scale/(double)duration)+0.99))\\r
+       (static_cast<size_t>(48000.0/((double)scale/(double)duration)+0.99)*2)\\r
 }\r
 \r
 namespace caspar { namespace core {\r
        \r
 const video_format_desc format_descs[video_format::count] =  \r
 {                                                                         \r
-       DEFINE_VIDEOFORMATDESC(video_format::pal                ,720,  576,  1024, 576,  field_mode::upper,                     25,             1,              L"PAL"), \r
-       DEFINE_VIDEOFORMATDESC(video_format::ntsc               ,720,  486,  864,  486,  field_mode::lower,                     30000,  1001,   L"NTSC"), \r
+       DEFINE_VIDEOFORMATDESC(video_format::pal                ,720,  576,  1024,  576,  field_mode::upper,            25,             1,              L"PAL"), \r
+       DEFINE_VIDEOFORMATDESC(video_format::ntsc               ,720,  486,  720,  534,  field_mode::lower,                     30000,  1001,   L"NTSC"), \r
        DEFINE_VIDEOFORMATDESC(video_format::x576p2500  ,720,  576,  720,  576,  field_mode::progressive,       25,             1,              L"576p2500"),\r
        DEFINE_VIDEOFORMATDESC(video_format::x720p2500  ,1280, 720,  1280, 720,  field_mode::progressive,       25,             1,              L"720p2500"), \r
        DEFINE_VIDEOFORMATDESC(video_format::x720p5000  ,1280, 720,  1280, 720,  field_mode::progressive,       50,             1,              L"720p5000"), \r