X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fvideo_format.h;h=fdbe1bd3ee49fff95159360fd029fa9a0d5eaaaa;hb=f054618ec557df435df17047f6d72b5d36e4b496;hp=170a025206dd579a030f49f55c5b6058de2aff3e;hpb=51cc844366d70779e17803ab721e23b62e9f9442;p=casparcg

diff --git a/core/video_format.h b/core/video_format.h
index 170a02520..fdbe1bd3e 100644
--- a/core/video_format.h
+++ b/core/video_format.h
@@ -51,18 +51,17 @@ struct video_format
 	};
 };
 
-struct video_mode 
+struct field_mode 
 { 
 	enum type
 	{
-		progressive = 0,
-		lower,
-		upper,
-		count,
-		invalid
+		empty		= 0,
+		lower		= 1,
+		upper		= 2,
+		progressive = 3 // NOTE: progressive == lower | upper;
 	};
 
-	static std::wstring print(video_mode::type value)
+	static std::wstring print(field_mode::type value)
 	{
 		switch(value)
 		{
@@ -84,7 +83,9 @@ struct video_format_desc
 
 	size_t					width;		// output frame width
 	size_t					height;		// output frame height
-	video_mode::type		mode;		// progressive, interlaced upper field first, interlaced lower field first
+	size_t					square_width;
+	size_t					square_height;
+	field_mode::type		field_mode;	// progressive, interlaced upper field first, interlaced lower field first
 	double					fps;		// actual framerate, e.g. i50 = 25 fps, p50 = 50 fps
 	size_t					time_scale;
 	size_t					duration;