(2),\\r
(48000),\\r
(2),\\r
- (static_cast<size_t>(48000.0*2.0/((double)scale/(double)duration)))\\r
+ (static_cast<size_t>(48000.0*2.0/((double)scale/(double)duration)+0.99))\\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, video_mode::upper, 25, 1, TEXT("pal") ), \r
- DEFINE_VIDEOFORMATDESC(video_format::ntsc ,720, 486, video_mode::lower, 30000, 1001, TEXT("ntsc") ), \r
+ DEFINE_VIDEOFORMATDESC(video_format::pal ,720, 576, video_mode::upper, 25, 1, TEXT("PAL") ), \r
+ DEFINE_VIDEOFORMATDESC(video_format::ntsc ,720, 486, video_mode::lower, 30000, 1001, TEXT("NTSC") ), \r
DEFINE_VIDEOFORMATDESC(video_format::x576p2500 ,720, 576, video_mode::progressive, 25, 1, TEXT("576p2500")),\r
DEFINE_VIDEOFORMATDESC(video_format::x720p2500 ,1280, 720, video_mode::progressive, 25, 1, TEXT("720p2500")), \r
DEFINE_VIDEOFORMATDESC(video_format::x720p5000 ,1280, 720, video_mode::progressive, 50, 1, TEXT("720p5000")), \r
DEFINE_VIDEOFORMATDESC(video_format::x1080p2397 ,1920, 1080, video_mode::progressive, 24000, 1001, TEXT("1080p2398")),\r
DEFINE_VIDEOFORMATDESC(video_format::x1080p2400 ,1920, 1080, video_mode::progressive, 24, 1, TEXT("1080p2400")),\r
DEFINE_VIDEOFORMATDESC(video_format::x1080i5000 ,1920, 1080, video_mode::upper, 25, 1, TEXT("1080i5000")),\r
- DEFINE_VIDEOFORMATDESC(video_format::x1080i5994 ,1920, 1080, video_mode::upper, 60000, 1001, TEXT("1080i5994")),\r
- DEFINE_VIDEOFORMATDESC(video_format::x1080i6000 ,1920, 1080, video_mode::upper, 60, 1, TEXT("1080i6000")),\r
+ DEFINE_VIDEOFORMATDESC(video_format::x1080i5994 ,1920, 1080, video_mode::upper, 30000, 1001, TEXT("1080i5994")),\r
+ DEFINE_VIDEOFORMATDESC(video_format::x1080i6000 ,1920, 1080, video_mode::upper, 30, 1, TEXT("1080i6000")),\r
DEFINE_VIDEOFORMATDESC(video_format::x1080p2500 ,1920, 1080, video_mode::progressive, 25, 1, TEXT("1080p2500")),\r
DEFINE_VIDEOFORMATDESC(video_format::x1080p2997 ,1920, 1080, video_mode::progressive, 30000, 1001, TEXT("1080p2997")),\r
DEFINE_VIDEOFORMATDESC(video_format::x1080p3000 ,1920, 1080, video_mode::progressive, 30, 1, TEXT("1080p3000")),\r
DEFINE_VIDEOFORMATDESC(video_format::x1080p5000 ,1920, 1080, video_mode::progressive, 50, 1, TEXT("1080p5000")),\r
- DEFINE_VIDEOFORMATDESC(video_format::invalid ,0, 0, video_mode::invalid, 1, 1, TEXT("invalid"))\r
+ DEFINE_VIDEOFORMATDESC(video_format::invalid ,0, 0, video_mode::count, 1, 1, TEXT("invalid"))\r
};\r
\r
const video_format_desc& video_format_desc::get(video_format::type format) \r