Removed unnecessary parameter to ffmpeg::make_frame()

diff --git a/modules/ffmpeg/producer/muxer/frame_muxer.cpp b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
index 3b286bd827871a1f08368cdcb2923548679ac9ca..055ec9d0fd6572fa87a3112b4b3667d31ea412ae 100644 (file)
--- a/modules/ffmpeg/producer/muxer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
@@ -146,7 +146,7 @@ struct frame_muxer::impl : boost::noncopyable
                        filter_->push(video);
                        previous_frame_ = video;
                        for (auto& av_frame : filter_->poll_all())
-                               video_stream_.push(make_frame(this, av_frame, format_desc_.fps, *frame_factory_, channel_layout_));
+                               video_stream_.push(make_frame(this, av_frame, *frame_factory_, channel_layout_));
                }
 
                merge();

diff --git a/modules/ffmpeg/producer/util/util.cpp b/modules/ffmpeg/producer/util/util.cpp
index b6f2a8f0b17dc891cd65ba03cb6e2e96bf7c06cd..0f525d6f02f5649981b17d031bc1c9c4380f98d2 100644 (file)
--- a/modules/ffmpeg/producer/util/util.cpp
+++ b/modules/ffmpeg/producer/util/util.cpp
@@ -149,7 +149,7 @@ core::pixel_format_desc pixel_format_desc(PixelFormat pix_fmt, int width, int he
        }
 }
 
-core::mutable_frame make_frame(const void* tag, const spl::shared_ptr<AVFrame>& decoded_frame, double fps, core::frame_factory& frame_factory, const core::audio_channel_layout& channel_layout)
+core::mutable_frame make_frame(const void* tag, const spl::shared_ptr<AVFrame>& decoded_frame, core::frame_factory& frame_factory, const core::audio_channel_layout& channel_layout)
 {                      
        static tbb::concurrent_unordered_map<int64_t, tbb::concurrent_queue<std::shared_ptr<SwsContext>>> sws_contvalid_exts_;
        

diff --git a/modules/ffmpeg/producer/util/util.h b/modules/ffmpeg/producer/util/util.h
index 41e7d4e5fca9ff507242719491261231f621c21e..9d2f4e4587ec22bc9f3e15a328198c0a60b9f840 100644 (file)
--- a/modules/ffmpeg/producer/util/util.h
+++ b/modules/ffmpeg/producer/util/util.h
@@ -56,7 +56,7 @@ namespace caspar { namespace ffmpeg {
 // Utils
 
 core::field_mode                                       get_mode(const AVFrame& frame);
-core::mutable_frame                                    make_frame(const void* tag, const spl::shared_ptr<AVFrame>& decoded_frame, double fps, core::frame_factory& frame_factory, const core::audio_channel_layout& channel_layout);
+core::mutable_frame                                    make_frame(const void* tag, const spl::shared_ptr<AVFrame>& decoded_frame, core::frame_factory& frame_factory, const core::audio_channel_layout& channel_layout);
 spl::shared_ptr<AVFrame>                       make_av_frame(core::mutable_frame& frame);
 spl::shared_ptr<AVFrame>                       make_av_frame(std::array<uint8_t*, 4> data, const core::pixel_format_desc& pix_desc);