Made ffmpeg producer output relative path (to media folder) via OSC instead of absolu...

[casparcg] / core / video_format.h

diff --git a/core/video_format.h b/core/video_format.h
index 48bbc1ed214ddbe749da7cce39edaa386eb5fcea..1b4ed3a69b8d393a96dcafa1322187ee66e76626 100644 (file)
--- a/core/video_format.h
+++ b/core/video_format.h
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r
@@ -52,6 +52,14 @@ struct video_format
                x1080p5000,\r
                x1080p5994,\r
                x1080p6000,\r
+               x2k2398,\r
+               x2k2400,\r
+               x2k2500,\r
+               x4k2398,\r
+               x4k2400,\r
+               x4k2500,\r
+               x4k2997,\r
+               x4k3000,\r
                invalid,\r
                count\r
        };\r
@@ -100,8 +108,7 @@ struct video_format_desc
        std::wstring                    name;           // name of output format\r
 \r
        size_t                                  audio_sample_rate;\r
-       size_t                                  audio_channels;\r
-       std::vector<size_t>             audio_cadence;\r
+       std::vector<size_t>             audio_cadence; // rotating optimal number of samples per frame\r
 \r
        static const video_format_desc& get(video_format::type format);\r
        static const video_format_desc& get(const std::wstring& name);\r