Merged new video mode support from trunk

[casparcg] / core / video_format.h

diff --git a/core/video_format.h b/core/video_format.h
index 713ae6cc39a7058ebe54d95ad3481ddd32f46f36..377309f91fdee4c6133b94da6b3a4b1458a68c10 100644 (file)
--- a/core/video_format.h
+++ b/core/video_format.h
@@ -37,10 +37,14 @@ struct video_format_def
                ntsc,           
                x576p2500,      
                x720p2500,      
-               x720p5000,      
-               x720p5994,      
-               x720p6000,      
-               x1080p2397,     
+               x720p5000,
+               x720p2398,
+               x720p2400,
+               x720p2997,
+               x720p5994,
+               x720p3000,
+               x720p6000,
+               x1080p2398,
                x1080p2400,     
                x1080i5000,     
                x1080i5994,     
@@ -48,7 +52,9 @@ struct video_format_def
                x1080p2500,     
                x1080p2997,     
                x1080p3000,     
-               x1080p5000,     
+               x1080p5000,
+               x1080p5994,
+               x1080p6000,
                invalid,
                count
        };