X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fvideo_format.h;h=27d3c7fecf155be8f91a5695f02f194c7d824464;hb=fc26f2e65efe6f8ce2556bd21113ffbf867ac873;hp=593671540f613f0efab44333f116bd1545ad0027;hpb=17c59c250c4c7966c2d76e7ccc52b201d7d4707d;p=casparcg

diff --git a/core/video_format.h b/core/video_format.h
index 593671540..27d3c7fec 100644
--- a/core/video_format.h
+++ b/core/video_format.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+* Copyright 2013 Sveriges Television AB http://casparcg.com/
 *
 * This file is part of CasparCG (www.casparcg.com).
 *
@@ -35,9 +35,13 @@ struct video_format
 		x576p2500,
 		x720p2500,
 		x720p5000,
+		x720p2398,
+		x720p2400,
+		x720p2997,
 		x720p5994,
+		x720p3000,
 		x720p6000,
-		x1080p2397,
+		x1080p2398,
 		x1080p2400,
 		x1080i5000,
 		x1080i5994,
@@ -46,6 +50,16 @@ struct video_format
 		x1080p2997,
 		x1080p3000,
 		x1080p5000,
+		x1080p5994,
+		x1080p6000,
+		x1556p2398,
+		x1556p2400,
+		x1556p2500,
+		x2160p2398,
+		x2160p2400,
+		x2160p2500,
+		x2160p2997,
+		x2160p3000,
 		invalid,
 		count
 	};
@@ -94,8 +108,7 @@ struct video_format_desc
 	std::wstring			name;		// name of output format
 
 	size_t					audio_sample_rate;
-	size_t					audio_channels;
-	std::vector<size_t>		audio_cadence;
+	std::vector<size_t>		audio_cadence; // rotating optimal number of samples per frame
 
 	static const video_format_desc& get(video_format::type format);
 	static const video_format_desc& get(const std::wstring& name);