2.1.0: -data_frame: Added field_mode and frame_rate meta-data.

[casparcg] / modules / ffmpeg / producer / util / util.h

diff --git a/modules/ffmpeg/producer/util/util.h b/modules/ffmpeg/producer/util/util.h
index 06d843c836d7a28b31d6a6ff2a3da1c95e6bd2a8..13573965dc731aa979e32939f3713af3e339cdaa 100644 (file)
--- a/modules/ffmpeg/producer/util/util.h
+++ b/modules/ffmpeg/producer/util/util.h
@@ -38,9 +38,9 @@ struct AVRational;
 struct AVCodecContext;\r
 \r
 FORWARD2(caspar, core, struct pixel_format_desc);\r
-FORWARD2(caspar, core, struct write_frame);\r
-FORWARD2(caspar, core, struct data_frame);\r
-FORWARD2(caspar, core, struct frame_factory);\r
+FORWARD2(caspar, core, class write_frame);\r
+FORWARD2(caspar, core, class data_frame);\r
+FORWARD2(caspar, core, class frame_factory);\r
 \r
 namespace caspar { namespace ffmpeg {\r
                \r
@@ -55,7 +55,7 @@ static const int CASPAR_PIX_FMT_LUMA = 10; // Just hijack some unual pixel forma
 \r
 core::field_mode                                       get_mode(const AVFrame& frame);\r
 int                                                                    make_alpha_format(int format); // NOTE: Be careful about CASPAR_PIX_FMT_LUMA, change it to PIX_FMT_GRAY8 if you want to use the frame inside some ffmpeg function.\r
-spl::shared_ptr<core::write_frame>     make_write_frame(const void* tag, const spl::shared_ptr<AVFrame>& decoded_frame, const spl::shared_ptr<core::frame_factory>& frame_factory, int flags);\r
+spl::shared_ptr<core::write_frame>     make_write_frame(const void* tag, const spl::shared_ptr<AVFrame>& decoded_frame, double fps, const spl::shared_ptr<core::frame_factory>& frame_factory, int flags);\r
 spl::shared_ptr<AVFrame>                       make_av_frame(caspar::core::data_frame& frame);\r
 spl::shared_ptr<AVFrame>                       make_av_frame(std::array<void*, 4> data, const core::pixel_format_desc& pix_desc);\r
 \r