2.0.0.2:

[casparcg] / core / producer / flash / flash_producer.cpp

diff --git a/core/producer/flash/flash_producer.cpp b/core/producer/flash/flash_producer.cpp
index 31f1fbfd502debb90d2c8fd60210969a45aa3d58..ca777dff21ca1ee730c12f592a71903ab672f3db 100644 (file)
--- a/core/producer/flash/flash_producer.cpp
+++ b/core/producer/flash/flash_producer.cpp
@@ -182,7 +182,7 @@ struct flash_producer::implementation
                                stop();\r
 \r
                                frame_buffer_.clear();\r
-                               frame_buffer_.try_push(draw_frame::eof().get_shared()); // EOF\r
+                               frame_buffer_.try_push(draw_frame::eof()); // EOF\r
                \r
                                current_frame_ = nullptr;\r
                        });\r
@@ -227,9 +227,9 @@ struct flash_producer::implementation
 \r
                        std::shared_ptr<draw_frame> frame;\r
                        if(is_progressive)\r
-                               frame = do_receive().get_shared();\r
+                               frame = do_receive();\r
                        else\r
-                               frame = composite_frame::interlace(do_receive(), do_receive(), format_desc.mode).get_shared();\r
+                               frame = std::shared_ptr<composite_frame>(composite_frame::interlace(do_receive(), do_receive(), format_desc.mode));\r
                        \r
                        frame_buffer_.push(frame);\r
                        is_empty_ = flashax_container_->IsEmpty();\r
@@ -261,7 +261,7 @@ struct flash_producer::implementation
 \r
        void initialize(const safe_ptr<frame_processor_device>& frame_processor)\r
        {\r
-               frame_processor_ = frame_processor.get_shared();\r
+               frame_processor_ = frame_processor;\r
                auto format_desc = frame_processor_->get_video_format_desc();\r
                bmp_frame_ = std::make_shared<bitmap>(format_desc.width, format_desc.height);\r
                start(false);\r